spree_essential_press 0.1.0.pre3 → 0.2.0

data/.gitignore

@@ -3,6 +3,5 @@
 .DS_Store
 Gemfile.lock
 pkg/*
-test/dummy/log
-test/dummy/tmp
-test/dummy/db/*.sqlite3
+test/dummy
+test/dummy_hooks/after_migrate.rb

data/.travis.yml

@@ -0,0 +1,8 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - rbx
+  - ree
+
+before_script: "bundle exec dummier"

data/Gemfile

@@ -1,4 +1,2 @@
 source "http://rubygems.org"
-
-# Specify your gem's dependencies in spree_essential_press.gemspec
 gemspec

data/LICENSE

@@ -1,23 +1,27 @@
-Redistribution and use in source and binary forms, with or without modification, 
+Copyright (c) 2011 Spencer Steffen and Citrus Media Group.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-    * Redistributions of source code must retain the above copyright notice, 
+    * Redistributions of source code must retain the above copyright notice,
       this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice, 
-      this list of conditions and the following disclaimer in the documentation 
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
       and/or other materials provided with the distribution.
-    * Neither the name of the Rails Dog LLC nor the names of its 
-      contributors may be used to endorse or promote products derived from this 
+
+    * Neither the name of Citrus Media Group nor the names of its
+      contributors may be used to endorse or promote products derived from this
       software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -1,26 +1,36 @@
-under construction...
+Spree Essential Press
+=====================
 
+A Press Page extension for Spree Commerce.
 
 
-Testing
--------
+Installation
+------------
 
-Tests are written with shoulda, capybara and factory_girl and run quickly with spork. To get setup, run these commands:
+In your existing spree site, add the following to your Gemfile:
 
-    git clone git://github.com/citrus/spree_essential_press.git
-    cd spree_essential_press
-    rake db:test_prep
-    spork
+    gem 'spree_essential_press'
     
-    # in another window
+Now run:
+
+    bundle install
     
-    cd to/your/spree_essential_press
     
-    # just one test
-    testdrb test/unit/press_test.rb
+Demo
+----
+
+You can easily use the test/dummy app as a demo of spree_essentials. Just `cd` to where you develop and run:
     
-    # just unit tests
-    testdrb test/unit/*
+    git clone git://github.com/citrus/spree_essential_press.git
+    cd spree_essential_press
+    mv lib/dummy_hooks/after_migrate.rb.sample lib/dummy_hooks/after_migrate.rb
+    bundle install
+    bundle exec dummier
+    cd test/dummy
+    bundle exec rails s
     
-    # all tests
-    testdrb test/unit/** test/functional/** test/integration/**
+
+License
+-------
+
+Copyright (c) 2011 Spencer Steffen, released under the New BSD License All rights reserved.

data/Rakefile

@@ -1,40 +1,10 @@
 # encoding: UTF-8
-require 'rubygems'
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must run `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-require 'rake'
-require 'rake/rdoctask'
+require "bundler/gem_tasks"
 require 'rake/testtask'
 
-Bundler::GemHelper.install_tasks
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
+Rake::TestTask.new do |t|
+  t.libs << 'lib' << 'test'
   t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-namespace :db do
-  desc "preps the test database"
-  task :test_prep do
-    dir = File.expand_path("../test/dummy/db", __FILE__)
-    db  = File.join(dir, "test.sqlite3")
-    File.delete(db) if File.exists?(db)
-    system("cd test/dummy; rake db:migrate RAILS_ENV=test")
-  end
 end
 
 task :default => :test
-
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'SpreeEssentialPress'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/Versionfile

@@ -1,2 +1,4 @@
-"0.50.x" => { :branch => "master" }
-"0.40.x" => { :branch => "master" }
+"0.70.x" => { :branch => "0.70.x" }
+"0.60.x" => { :branch => "0.60.x" }
+"0.50.x" => { :branch => "0.60.x" }
+"0.40.x" => { :branch => "0.60.x" }

data/app/controllers/admin/press_controller.rb

@@ -7,7 +7,7 @@ class Admin::PressController < Admin::ResourceController
     params[:search] ||= {}
     params[:search][:meta_sort] ||= "published_at.desc"
     @search = Press.metasearch(params[:search])
-    @collection = @search.paginate(:per_page => Spree::Config[:admin_products_per_page], :page => params[:page])
-  end  
+    @collection = @search.page(params[:page]).per(Spree::Config[:admin_products_per_page])
+  end
 
 end

data/app/controllers/press_controller.rb

@@ -4,4 +4,4 @@ class PressController < Spree::BaseController
     @press = Press.all
   end  
   
-end
+end

data/app/overrides/spree_essential_press.rb

@@ -0,0 +1,5 @@
+Deface::Override.new(:virtual_path  => "layouts/admin",
+                     :name          => "press_admin_tab",
+                     :insert_bottom => "[data-hook='admin_tabs'], #admin_tabs[data-hook]",
+                     :partial       => "admin/hooks/press_tab",
+                     :disabled      => !SpreeEssentialPress.independent?)

data/app/views/admin/press/_form.html.erb

@@ -1,40 +1,29 @@
 <%= f.field_container :title do %>
-  <%= f.label :title, t('press.title') %><br />
+  <%= f.label :title, t('activerecord.attributes.press.title') %><br />
   <%= f.text_field :title, :class => 'title' %>
   <%= error_message_on :press, :title %>
 <% end %>
 
 <%= f.field_container :publication do %>
-  <%= f.label :publication, t('press.publication') %><br />
+  <%= f.label :publication, t('activerecord.attributes.press.publication') %><br />
   <%= f.text_field :publication, :class => 'text' %>
   <%= error_message_on :press, :publication %>
 <% end %>
 
 <%= f.field_container :published_at do %>
-  <%= f.label :published_at, t('press.published_at') %><br />
-  <%= f.text_field :published_at, :class => 'text', :value => (@press.published_at.to_s(:long) unless @press.new_record?) %><br />
+  <%= f.label :published_at, t('activerecord.attributes.press.published_at') %><br />
+  <%= f.date_select :published_at, :order => [ :month, :day, :year ] %><br />
   <%= error_message_on :press, :published_at %>
 <% end %>
 
 <%= f.field_container :description do %>
-  <%= f.label :description, t('press.description') %><br />
+  <%= f.label :description, t('activerecord.attributes.press.description') %><br />
   <%= f.text_area :description, :class => 'text' %>
   <%= error_message_on :press, :description %>
 <% end %>
 
 <%= f.field_container :url do %>
-  <%= f.label :url, t('press.url') %><br />
+  <%= f.label :url, t('activerecord.attributes.press.url') %><br />
   <%= f.text_field :url, :class => 'text' %>
   <%= error_message_on :press, :url %>
 <% end %>
-
-<% content_for :head do %>
-  <%= javascript_include_tag 'date.js', 'jquery.autodate.js' %>
-  <script type="text/javascript">
-  //<![CDATA[
-    $(document).ready(function() {
-      $('#press_published_at').autodate();
-    }); 
-  //]]>
-  </script>
-<% end %>

data/app/views/admin/press/edit.html.erb

@@ -1,8 +1,8 @@
 <%= render 'admin/shared/press_tabs', :current => "Press Details" %>
 
-<% form_for(@press, :url => object_url, :html => { :multipart => true, :method => :put }) do |f| %>
+<%= form_for(@press, :url => object_url, :html => { :multipart => true, :method => :put }) do |f| %>
   <%= render :partial => 'form', :locals => { :f => f } %>
   <p class="form-buttons">
     <%= button t('update') %> <%= link_to t('cancel'), collection_url %>
   </p>
-<% end %>
+<% end %>

data/app/views/admin/press/index.html.erb

@@ -36,7 +36,7 @@
   </tbody>
 </table>
 
-<%= will_paginate(:prev => "&#171; #{t('previous')}", :next => "#{t('next')} &#187;") %>
+<%= paginate @collection %>
 
 
 <% content_for :sidebar do %>
@@ -45,28 +45,11 @@
 
   <% @press = Press.metasearch %>
   <%= form_for [:admin, @press] do |f| %>
-    <%- locals = {:f => f} %>
-    <%= hook :admin_press_index_search, locals do %>
-      <p>
-        <label><%= t 'press.title' %></label><br />
-        <%= f.text_field :title_like, :size => 25 %>
-      </p>  
-      <label><%= t('date_range') %></label><br />
-      <div class="yui-g date-range-filter">
-        <div class="yui-u sub-field first">
-          <%= f.spree_date_picker :published_at_greater_than %><br />
-          <label class="sub"><%= t('start') %></label>
-        </div>
-        <div class="yui-u sub-field">
-          <%= f.spree_date_picker :published_at_less_than %><br />
-          <label><%= t('stop') %></label>
-        </div>
-        <br class="clear"/>
-      </div>
-    <% end %>
-    <%= hook :admin_press_index_search_buttons, locals do %>
-      <p><%= button t('search') %></p>
-    <% end %>
+    <p>
+      <label><%= t 'activerecord.attributes.press.title' %></label><br />
+      <%= f.text_field :title_like, :size => 25 %>
+    </p>  
+    <p><%= button t('search') %></p>
   <% end %>
 </div>
 <% end %>

data/config/locales/en.yml

@@ -1,22 +1,29 @@
 en:
 
+  successfully_created: "%{resource} was successfully created."
+  successfully_updated: "%{resource} was successfully updated."
+  successfully_removed: "%{resource} was successfully removed."
+
+  press: Press
+
   activerecord:
+    attributes:
+      press:
+        title: Title
+        publication: Publication
+        published_at: Published On
+        description: Description
+        url: URL        
+        
     errors:
       messages:
         invalid_date_time: is an invalid date.
-        
-  press:
-    title: Title
-    publication: Publication
-    published_at: Published On
-    description: Description
-    url: URL
     
-    index:
-      press: Press
-      
-    press:
-      read_more: Read More
+  #index:
+  #  press: Press
+  #  
+  #press:
+  #  read_more: Read More
     
   admin:
     press:
@@ -40,8 +47,3 @@ en:
       press_tabs:
         editing_press: Edit Press Mention 
         press_details: Press Mention Details
-        
-    
-  successfully_created: Successfully created
-  successfully_updated: Successfully updated
-  successfully_destroyed: Successfully destroyed

data/lib/generators/essentials_base.rb

@@ -4,15 +4,24 @@ module SpreeEssentials
     
       include Rails::Generators::Migration      
 
-      def self.count!
+      def self.count
         @count ||= 0
         (@count += 1) * 3
       end
+      
+      def self.new_migration_number
+        (Time.new.utc + self.count).strftime("%Y%m%d%H%M%S")
+      end
 
       def self.next_migration_number(path)
         @time ||= Time.new.utc
         if ActiveRecord::Base.timestamped_migrations
-          (@time + self.count!).strftime("%Y%m%d%H%M%S")
+          files = Dir.entries(Rails.root.join("db/migrate"))
+          migration = new_migration_number
+          while files.join.include?(migration)
+            migration = new_migration_number
+          end
+          migration
         else
           "%.3d" % (current_migration_number(dirname) + 1)
         end
@@ -20,4 +29,4 @@ module SpreeEssentials
       
     end
   end
-end
+end

data/lib/generators/spree_essentials/press_generator.rb

@@ -13,4 +13,4 @@ module SpreeEssentials
 
     end
   end
-end
+end

data/lib/spree_essential_press.rb

@@ -1,13 +1,11 @@
 require 'spree_core'
-require 'spree_auth'
-require 'meta_search'
 
 require 'spree_essential_press/inflection'
   
 module SpreeEssentialPress
   
   def self.tab
-    [:press, { :route => :admin_press_index }]
+    { :label => 'Press', :route => :admin_press_index }
   end
   
   def self.sub_tab
@@ -20,13 +18,24 @@ module SpreeEssentialPress
   end
   
   class Engine < Rails::Engine
-    config.autoload_paths += %W(#{config.root}/lib)    
+    
+    config.autoload_paths += %W(#{config.root}/lib)
+    
+    if SpreeEssentialPress.independent?
+      config.to_prepare do
+      
+        #loads application's deface view overrides
+        Dir.glob File.expand_path("../../app/overrides/*.rb", __FILE__) do |c|
+          Rails.application.config.cache_classes ? require(c) : load(c)
+        end
+        
+      end
+    end
+    
   end
   
 end
 
-if SpreeEssentialPress.independent?
-  require 'spree_essential_press/custom_hooks'
-else 
+unless SpreeEssentialPress.independent?
   SpreeEssentials.register :press, SpreeEssentialPress 
-end
+end

data/lib/spree_essential_press/version.rb

@@ -1,3 +1,3 @@
 module SpreeEssentialPress
-  VERSION = "0.1.0.pre3"
+  VERSION = "0.2.0"
 end

data/spree_essential_press.gemspec

@@ -18,22 +18,12 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
  
   # Spree
-  s.add_dependency('spree_core', '>= 0.30.1')
-  s.add_dependency('spree_auth', '>= 0.30.1')
+  s.add_dependency('spree_core', '>= 0.70.0')
   
-  # Pre 0.50.0
-  s.add_dependency('meta_search', '>= 1.0.1')
-     
   # Development
-  s.add_development_dependency('spree_essentials',   '>= 0.1.0.pre')
-	s.add_development_dependency('shoulda',            '>= 2.11.3')
-	s.add_development_dependency('factory_girl',       '>= 2.0.0.beta2')
-	s.add_development_dependency('cucumber',           '>= 0.10.2')
-	s.add_development_dependency('capybara',           '>= 0.4.1')
-	s.add_development_dependency('selenium-webdriver', '>= 0.1.3')
+  s.add_development_dependency('dummier',            '>= 0.2.4')
+	s.add_development_dependency('shoulda',            '>= 3.0.0.beta2')
+	s.add_development_dependency('factory_girl',       '>= 2.3.2')
   s.add_development_dependency('sqlite3',            '>= 1.3.3')
-  s.add_development_dependency('faker',              '>= 0.9.5')
-  s.add_development_dependency('spork',              '>= 0.9.0.rc5')
-  s.add_development_dependency('spork-testunit',     '>= 0.0.5')
   
-end
+end