spree_slider 1.1.0 → 1.2.0

data/.gitignore

@@ -8,4 +8,5 @@ tmp
 nbproject
 *.swp
 spec/dummy
-pkg/*
+pkg/*
+Gemfile.lock

data/Gemfile

@@ -1,13 +1,20 @@
 source 'http://rubygems.org'
 
 group :test do
-  gem 'ffaker'
-end
+  gem 'rspec-rails', '~> 2.11.0'
+  gem 'factory_girl', '~> 2.6.4'
+  gem 'factory_girl_rails', '~> 1.7'
+  gem 'faker'
+  gem 'shoulda-matchers'
+  gem 'guard-rspec'
+  gem 'sqlite3'
 
-if RUBY_VERSION < "1.9"
-  gem "ruby-debug"
-else
-  gem "ruby-debug19"
+  if RUBY_PLATFORM.downcase.include? "darwin"
+    gem 'rb-fsevent'
+    gem 'growl'
+  end
 end
 
+gem 'spree', '~> 1.1.3'
+
 gemspec

data/Versionfile

@@ -1,11 +1,3 @@
-# This file is used to designate compatibilty with different versions of Spree
-# Please see http://spreecommerce.com/documentation/extensions.html#versionfile for details
-
-# Examples
-#
-# "0.70.x" => { :branch => "master"}
-# "0.60.x" => { :branch => "0-60-stable" }
-# "0.40.x" => { :tag => "v1.0.0", :version => "1.0.0" }
-
 "1.0.x" => { :ref => '2c31ead09bf6a62e7a0700a5d831c7933d63edd5' }
 "1.1.x" => { :branch => "master"}
+"1.2.x" => { :branch => "master"}

data/app/models/spree/slide.rb

@@ -1,5 +1,5 @@
 class Spree::Slide < ActiveRecord::Base
   has_attached_file :image
   scope :published, where(:published => true)
-  attr_accessible :name, :body, :link_url, :published, :image
+  attr_accessible :name, :body, :link_url, :published, :image, :position
 end

data/app/overrides/spree/admin/configurations/index/add_slides_to_admin_configurations_menu.html.erb.deface

@@ -0,0 +1,5 @@
+<!-- insert_bottom "[data-hook='admin_configurations_menu']" -->
+<tr>
+  <td><%= link_to 'Spree Slider', admin_slides_path %></td>
+  <td>Manage Spree Slider contents</td>
+</tr>

data/app/overrides/spree/admin/shared/_configuration_menu/add_slides_to_admin_configurations_sidebar_menu.html.erb.deface

@@ -0,0 +1,2 @@
+<!-- insert_bottom "[data-hook='admin_configurations_sidebar_menu']" -->
+<%= configurations_sidebar_menu_item 'Spree Slider', admin_slides_path %>

data/app/overrides/spree/home/index/add_slider.html.erb.deface

@@ -0,0 +1,4 @@
+<!-- insert_before '[data-hook="homepage_products"]' -->
+<% content_for :spree_slider do %>
+  <%= render 'spree/shared/slider' %>
+<% end %>

data/app/overrides/spree/layouts/spree_application/add_slider.html.erb.deface

@@ -0,0 +1,2 @@
+<!-- insert_after '#header[data-hook]' -->
+<%= yield :spree_slider %>

data/app/views/spree/admin/slides/_form.html.erb

@@ -18,4 +18,7 @@
   <%= f.label :is_published, t(:published) %><br />
   <%= f.check_box :published %>
 <% end %>
-
+<%= f.field_container :position do %>
+  <%= f.label :position, t(:position) %>
+  <%= f.number_field :position %>
+<% end %>

data/app/views/spree/admin/slides/index.html.erb

@@ -15,6 +15,7 @@
   <thead>
     <tr data-hook="admin_slides_index_headers">
       <th>Name</th>
+      <th data-hook="admin_slides_index_header_position">Position</th>
       <th data-hook="admin_slides_index_header_actions"></th>
     </tr>
   </thead>
@@ -22,6 +23,7 @@
     <% @slides.each do |slide|%>
       <tr id="<%= dom_id slide %>" data-hook="admin_slides_index_rows">
         <td width="350px" ><%=link_to slide.name, object_url(slide) %></td>
+        <td data-hook="admin_slides_index_position"><%= slide.position %></td>
         <td data-hook="admin_slides_index_row_actions">
           <%= link_to_edit slide, :class => 'edit' %> &nbsp;
           <%= link_to_delete slide %>

data/app/views/spree/admin/slides/show.html.erb

@@ -33,6 +33,12 @@
       <%= @slide.image_file_name %>
     </td>
   </tr>
+  <tr data-hook="position">
+    <th><%= t(:position) %></th>
+    <td>
+      <%= @slide.position %>
+    </td>
+  </tr>
 </table>
 
 <p>

data/config/locales/de.yml

@@ -0,0 +1,3 @@
+de:
+  next: "Nächste"
+  previous: "Vorhergehend"

data/config/locales/en.yml

@@ -1,5 +1,3 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
 en:
-  hello: "Hello world"
+  next: "Next"
+  previous: "Previous"

data/config/locales/es.yml

@@ -0,0 +1,3 @@
+es:
+  next: "Próximo"
+  previous: "Previo"

data/config/locales/nl-NL.yml

@@ -0,0 +1,3 @@
+nl-NL:
+  next: "Volgende"
+  previous: "Vorige"

data/config/locales/nl.yml

@@ -0,0 +1,3 @@
+nl:
+  next: "Volgende"
+  previous: "Vorige"

data/db/migrate/20120816192758_add_position_to_slides.rb

@@ -0,0 +1,5 @@
+class AddPositionToSlides < ActiveRecord::Migration
+  def change
+    add_column :spree_slides, :position, :integer, :null => false, :default => 0
+  end
+end

data/lib/generators/spree_slider/install_simple_carousel_generator.rb

@@ -0,0 +1,30 @@
+module SpreeSlider
+  class InstallSimpleCarouselGenerator < Rails::Generators::Base
+    source_root File.expand_path("../templates", __FILE__)    
+    def install
+      #copy slider partial
+      copy_file "simple_carousel_slider.html.erb", "app/views/spree/shared/_slider.html.erb"      
+      
+      #add javascripts
+      append_file "app/assets/javascripts/store/all.js", "//= require simple.carousel\n" 
+      append_file "app/assets/javascripts/store/all.js", "//= require simple.carousel.slider\n" 
+      
+      
+      #copy migrations
+      run 'bundle exec rake railties:install:migrations FROM=spree_slider' 
+
+      #run migrations
+      res = ask "Would you like to run the migrations now? [Y/n]"
+      if res == "" || res.downcase == "y"
+        run 'bundle exec rake db:migrate'
+      else
+        puts "Skiping rake db:migrate, don't forget to run it!"
+      end
+
+    end
+  end
+end
+
+
+
+

data/lib/generators/spree_slider/templates/anything_slider.html.erb

@@ -15,7 +15,7 @@
 
   <div class="slider-wrapper">
     <ul id="slider">
-      <% Spree::Slide.published.each do |s| %>
+      <% Spree::Slide.published.order('position ASC').each do |s| %>
         <li><%= link_to image_tag(s.image.url, :title => '#' + s.name.to_url), s.link_url %></li>
       <% end %>
     </ul>

data/lib/generators/spree_slider/templates/nivo_slider.html.erb

@@ -13,7 +13,7 @@
   <div class="slider-wrapper theme-default">
     <div class="ribbon"></div>
     <div id="slider" class="nivoSlider">
-      <% Spree::Slide.published.each do |s| %>
+      <% Spree::Slide.published.order('position ASC').each do |s| %>
         <% if s.body != "" %>
           <%= link_to image_tag(s.image.url, :title => '#' + s.name.to_url), s.link_url %>
         <% else %>
@@ -22,7 +22,7 @@
       <% end %>
     </div>
 
-    <% Spree::Slide.published.each do |s| %>
+    <% Spree::Slide.published.order('position ASC').each do |s| %>
       <div id='<%= s.name.to_url %>' class='nivo-html-caption'>
         <%= s.body.html_safe %>
       </div>

data/lib/generators/spree_slider/templates/simple_carousel_slider.html.erb

@@ -0,0 +1,15 @@
+<% if Spree::Slide.published.count > 0 %>
+  <section id="slideshow">
+    <ul class="slider regular">
+      <% Spree::Slide.published.order('position ASC').each do |s| %>
+        <li>
+          <h1><%= s.name %></h1>
+          <%= link_to image_tag(s.image.url, :title => s.name.to_url), s.link_url %>
+        </li>
+      <% end %>
+    </ul>
+    
+    <a title="<%= t(:previous) %>" class="slider-prev"><%= t(:previous)%></a>
+  	<a title="<%= t(:next) %>" class="slider-next"><%= t(:next) %></a>
+  </section>
+<% end %>

data/lib/spree_slider/engine.rb

@@ -1,5 +1,7 @@
 module SpreeSlider
   class Engine < Rails::Engine
+    require 'spree/core'
+    isolate_namespace Spree
     engine_name 'spree_slider'
 
     config.autoload_paths += %W(#{config.root}/lib)
@@ -10,9 +12,6 @@ module SpreeSlider
     end
 
     def self.activate
-      Dir.glob(File.join(File.dirname(__FILE__), "../../app/overrides/*.rb")) do |c|
-        Rails.application.config.cache_classes ? require(c) : load(c)
-      end
       Dir.glob(File.join(File.dirname(__FILE__), "../../app/**/*_decorator*.rb")) do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)
       end

data/spec/spec_helper.rb

@@ -1,32 +1,21 @@
-# Configure Rails Environment
-ENV["RAILS_ENV"] = "test"
-
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
-
+ENV["RAILS_ENV"] ||= 'test'
+require File.expand_path("../dummy/config/environment", __FILE__)
 require 'rspec/rails'
 
-# Requires supporting ruby files with custom matchers and macros, etc,
-# in spec/support/ and its subdirectories.
-Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each {|f| require f }
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
-# Requires factories defined in spree_core
 require 'spree/core/testing_support/factories'
+require 'spree/core/testing_support/env'
+require 'spree/core/testing_support/controller_requests'
+require 'spree/core/url_helpers'
 
 RSpec.configure do |config|
-  # == Mock Framework
-  #
-  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
   config.mock_with :rspec
-
-  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
   config.fixture_path = "#{::Rails.root}/spec/fixtures"
-
-  # If you're not using ActiveRecord, or you'd prefer not to run each of your
-  # examples within a transaction, remove the following line or assign false
-  # instead of true.
   config.use_transactional_fixtures = true
-end
+
+  config.include Spree::Core::TestingSupport::ControllerRequests
+  config.include Devise::TestHelpers, :type => :controller
+end

data/spree_slider.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_slider'
-  s.version     = '1.1.0'
+  s.version     = '1.2.0'
   s.summary     = 'Spree Slider extension'
   s.description = 'Adds a slider to the homepage'
   s.required_ruby_version = '>= 1.8.7'
@@ -16,11 +16,5 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'spree_core', '~> 1.1.0'
-
-  #  s.add_development_dependency 'capybara', '1.0.1'
-  #  s.add_development_dependency 'factory_girl'
-  s.add_development_dependency 'ffaker'
-  #  s.add_development_dependency 'rspec-rails',  '~> 2.7'
-  s.add_development_dependency 'sqlite3'
+  s.add_dependency 'spree_core', '>= 1.1.0'
 end

data/vendor/assets/simple-carousel/readme.txt

@@ -0,0 +1,6 @@
+Simple Carousel
+Copyright (c) 2010 Tobias Zeising, http://www.aditu.de
+Licensed under the MIT license
+Version 0.3
+
+http://code.google.com/p/simple-carousel/

data/vendor/assets/simple-carousel/simple.carousel.js

@@ -0,0 +1,144 @@
+/**
+ * Simple Carousel
+ * Copyright (c) 2010 Tobias Zeising, http://www.aditu.de
+ * Licensed under the MIT license
+ * 
+ * http://code.google.com/p/simple-carousel/
+ * Version 0.3
+ */
+(function($){
+$.fn.simplecarousel = function( params ) {
+    // set config
+    var defaults = {
+        width: 700,
+        height: 500,
+        next: false,
+        prev: false,
+        vertical: false,
+        auto: false,
+        fade: false,
+        current: 0,
+        items: 0,
+        slidespeed: 600,
+        visible: 1,
+        pagination: false
+    };
+    var config = $.extend(defaults, params);
+    
+    // configure carousel ul and li
+    var ul = $(this);
+    var li = ul.children('li');
+    
+    config.items = li.length;
+    
+    var height = config.height;
+    var width = config.width;
+    if(config.visible>1) {
+        if(config.vertical)
+            height = height*config.visible;
+        else
+            width = width*config.visible;
+    }
+    
+    ul.wrap('<div class="carousel-frame" style="width:'+width+'px;height:'+height+'px;overflow:hidden">');
+    var container = ul.parent('.carousel-frame');
+    if(!config.vertical) {
+        ul.width(config.items*config.width);
+        ul.height(config.height);
+    } else {
+        ul.width(config.width);
+        ul.height(config.items*config.height);
+    }
+    ul.css('overflow','hidden');
+    
+    li.each(function(i,item) {
+        $(item).width(config.width);
+        $(item).height(config.height);
+        if(!config.vertical)
+            $(item).css('float','left');
+    });
+    
+    // function for sliding the carousel
+    var slide = function(dir, click) {
+        if(typeof click == "undefined" & config.auto==false)
+            return;
+    
+        if(dir=="next") {
+            config.current += config.visible;
+            if(config.current>=config.items)
+                config.current = 0;
+        } else if(dir=="prev") {
+            config.current -= config.visible;
+            if(config.current<0)
+                config.current = (config.visible==1) ? config.items-1 : config.items-config.visible+(config.visible-(config.items%config.visible));
+        } else {
+            config.current = dir;
+        }
+        
+        // set pagination
+        if(config.pagination != false) {
+            container.next('.carousel-pagination').find('li').removeClass('carousel-pagination-active')
+            container.next('.carousel-pagination').find('li:nth-child('+(config.current+1)+')').addClass('carousel-pagination-active');
+        }
+        
+        // fade
+        if(config.fade!=false) {
+            ul.fadeOut(config.fade, function() {
+                ul.css({marginLeft: -1.0*config.current*config.width});
+                ul.fadeIn(config.fade);
+            });
+            
+        // slide
+        } else {
+            if(!config.vertical)
+                ul.animate( {marginLeft: -1.0*config.current*config.width}, config.slidespeed );
+            else
+                ul.animate( {marginTop: -1.0*config.current*config.height}, config.slidespeed );
+        }
+        
+        if(typeof click != "undefined")
+            config.auto = false;
+        
+        if(config.auto!=false)
+            setTimeout(function() {
+                slide('next');
+            }, config.auto);
+    }
+    
+    // include pagination
+    if(config.pagination != false) {
+        container.after('<ul class="carousel-pagination"></ul>');
+        var pagination = container.next('.carousel-pagination');
+        for(var i=0;i<config.items;i++) {
+            if(i==0)
+                pagination.append('<li class="carousel-pagination-active"></li>');
+            else
+                pagination.append('<li></li>');
+        }
+        
+        pagination.find('li').each(function(index, item) {
+            $(this).click(function() {
+                slide(index,true);
+            });
+        });
+    }
+        
+    // set event handler for next and prev
+    if(config.next!=false)
+        config.next.click(function() {
+            slide('next',true);
+        });
+        
+        
+    if(config.prev!=false)
+        config.prev.click(function() {
+            slide('prev',true);
+        });
+    
+    // start auto sliding
+    if(config.auto!=false)
+        setTimeout(function() {
+            slide('next');
+        }, config.auto);
+}
+})(jQuery);