spree_essentials 0.1.4 → 0.2.0

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

@@ -25,15 +25,14 @@ Installation
 
 If you don't already have an existing Spree site, [click here](https://gist.github.com/946719) then come back later... You can also read the Spree docs [here](http://spreecommerce.com/documentation/getting_started.html)...
 
-Spree Essentials hasn't been released to rubygems so you'll have to install it from the source. Just add the following to your Gemfile:
+Spree Essentials can be installed by itself by adding the following to your Gemfile:
 
-    gem 'spree_essentials', :git => 'git://github.com/citrus/spree_essentials.git'
+    gem 'spree_essentials', '0.2.0'
   
-    # Add any of the extensions you wish to use
+This isn't necessary if you're using spree_essentials based extensions. If that's the case, just include the extensions normally:
   
     gem 'spree_essential_cms', :git => 'git://github.com/citrus/spree_essential_cms.git'
     gem 'spree_essential_blog', :git => 'git://github.com/citrus/spree_essential_blog.git'
-    
   
     
 Then run:
@@ -161,6 +160,14 @@ To Do
 Change Log
 ----------
 
+**0.2.0 - 2011/7/14**
+
+* Depend on Spree 0.60.x and above
+* Remove spree_auth dependency
+* Removed `app/controllers/admin/resource_controller.rb` in favor of the Spree Default one
+* Updated development gems to most recent versions
+
+
 **0.1.4 - 2011/6/10**
 
 * Removed console.log from jquery.autodate.js

data/lib/spree_essentials/version.rb

@@ -1,3 +1,3 @@
 module SpreeEssentials
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

data/lib/spree_essentials.rb

@@ -1,5 +1,4 @@
 require 'spree_core'
-require 'meta_search'
 require 'rdiscount'
 
 module SpreeEssentials

metadata

@@ -2,7 +2,7 @@
 name: spree_essentials
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors: 
 - Spencer Steffen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-10 00:00:00 -07:00
+date: 2011-07-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,123 +20,90 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.30.0
+        version: 0.60.0
   type: :runtime
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: meta_search
+  name: rdiscount
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.1
+        version: 1.6.8
   type: :runtime
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rdiscount
+  name: shoulda
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.6.8
-  type: :runtime
+        version: 2.11.3
+  type: :development
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: dummier
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.11.3
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: dummier
+  name: factory_girl
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.1
+        version: 2.0.0.beta4
   type: :development
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: factory_girl
+  name: capybara
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0.beta2
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: sqlite3
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.10.2
+        version: 1.3.3
   type: :development
   prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: capybara
+  name: spork
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.1
+        version: 0.9.0.rc9
   type: :development
   prerelease: false
   version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: selenium-webdriver
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.1.3
-  type: :development
-  prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.3.3
-  type: :development
-  prerelease: false
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: spork
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.0.rc8
-  type: :development
-  prerelease: false
-  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: spork-testunit
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -144,7 +111,7 @@ dependencies:
         version: 0.0.5
   type: :development
   prerelease: false
-  version_requirements: *id012
+  version_requirements: *id009
 description: Spree Essentials provides a base for several other Spree Commerce extensions. The idea is to provide other extensions with common functionality such as an asset-upload interface, a markdown editor, and a common admin-navigation tab.
 email: 
 - spencer@citrusme.com
@@ -155,25 +122,17 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- CHANGELOG.md
 - README.md
 - LICENSE
 - config/locales/en.yml
 - config/routes.rb
-- lib/dummy_hooks/after_migrate.rb
-- lib/dummy_hooks/after_migrate.rb.sample
-- lib/dummy_hooks/before_migrate.rb
-- lib/dummy_hooks/templates/test.pdf
-- lib/dummy_hooks/templates/test.zip
 - lib/generators/essentials_base.rb
 - lib/generators/spree_essentials/install_generator.rb
 - lib/generators/templates/db/migrate/add_attachment_file_size_to_assets.rb
-- lib/spree_core/action_callbacks.rb
 - lib/spree_essentials/test_helper.rb
 - lib/spree_essentials/version.rb
 - lib/spree_essentials.rb
 - app/controllers/admin/markdown_controller.rb
-- app/controllers/admin/resource_controller.rb
 - app/controllers/admin/uploads_controller.rb
 - app/helpers/admin/base_helper_decorator.rb
 - app/models/image_decorator.rb
@@ -231,7 +190,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3910544631989460612
+      hash: -1301760498595422613
       segments: 
       - 0
       version: "0"
@@ -240,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3910544631989460612
+      hash: -1301760498595422613
       segments: 
       - 0
       version: "0"

data/CHANGELOG.md

@@ -1,64 +0,0 @@
-Change Log
-----------
-
-**0.1.4 - 2011/6/10**
-
-* Removed console.log from jquery.autodate.js
-* Updated resource controller with better flash message handling
-* Added faker.lorem.words to en.yml to prevent NoMethodError in integration tests
-
-
-**0.1.3 - 2011/6/8**
-
-* Added test in teardown to check for missing translations
-* Removed some old bits of CMS code
-
-
-**0.1.2 - 2011/6/7**
-
-* Added missing translation
-* Cleanup
-
-
-**0.1.1 - 2011/6/7**
-
-* Released 0.1.1
-* Updated resource_controller.rb to Spree 0.60.0's and added `translated_object_name` method. ([pull request #419](https://github.com/spree/spree/pull/419) on Spree)
-* Added upload integration test
-* Cleaned up en.yml
-
-
-**2011/6/6**
-
-* Removed `spree_auth` requirement
-* Added a few test helpers
-* Updated readme
-
-
-**0.1.0 2011/6/1**
-
-* Added [dummier](https://github.com/citrus/dummier)
-* Removed some remaining CMS bits
-
-
-**2011/4/26**
-
-* Modularized CMS. It can now be found [here](https://github.com/citrus/spree_essential_cms)
-
-
-**2011/4/12**
-
-* Added content contexts for multiple contents per page
-* Namespaced posts into blog/posts
-* Added `<!-- more -->` tag to posts
-
-
-**2011/4/4**
-
-* Added Page Images and starting to remove resource_controller.
-
-
-**2011/4/3**
-
-* Automatically adds [Heroku](http://heroku.com) support when you include [spree_heroku](https://github.com/paxer/spree-heroku) in your Gemfile. Check the [spree_heroku readme](https://github.com/paxer/spree-heroku#readme) for full installation instructions.
-* Creates default content when you create a new page.

data/app/controllers/admin/resource_controller.rb

@@ -1,230 +0,0 @@
-require 'spree_core/action_callbacks'
-class Admin::ResourceController < Admin::BaseController
-  helper_method :new_object_url, :edit_object_url, :object_url, :collection_url
-  before_filter :load_resource
-
-  respond_to :html
-  respond_to :js, :except => [:show, :index]
-
-  def flash_message_for(object, event_sym)
-    resource_desc  = object.class.model_name.human
-    resource_desc += " \"#{object.name}\"" if object.respond_to?(:name)
-    I18n.t(event_sym, :resource => resource_desc)  
-  end
-  
-  def new
-    respond_with(@object) do |format|
-      format.html { render :layout => !request.xhr? }
-      format.js { render :layout => false }
-    end
-  end
-
-  def edit
-    respond_with(@object) do |format|
-      format.html { render :layout => !request.xhr? }
-      format.js { render :layout => false }
-    end
-  end
-
-  def update
-    invoke_callbacks(:update, :before)
-    if @object.update_attributes(params[object_name])
-      invoke_callbacks(:update, :after)
-      flash[:notice] = flash_message_for(@object, :successfully_updated)
-      respond_with(@object) do |format|
-        format.html { redirect_to location_after_save }
-        format.js   { render :layout => false }
-      end
-    else
-      invoke_callbacks(:update, :fails)
-      respond_with(@object)
-    end
-  end
-
-  def create
-    invoke_callbacks(:create, :before)
-    if @object.save
-      invoke_callbacks(:create, :after)
-      flash[:notice] = flash_message_for(@object, :successfully_created)
-      respond_with(@object) do |format|
-        format.html { redirect_to location_after_save }
-        format.js   { render :layout => false }
-      end
-    else
-      invoke_callbacks(:create, :fails)
-      respond_with(@object)
-    end
-  end
-
-  def destroy
-    invoke_callbacks(:destroy, :before)
-    if @object.destroy
-      invoke_callbacks(:destroy, :after)
-      flash[:notice] = flash_message_for(@object, :successfully_removed)
-      respond_with(@object) do |format|
-        format.html { redirect_to collection_url }
-        format.js   { render :partial => "/admin/shared/destroy" }
-      end
-    else
-      invoke_callbacks(:destroy, :fails)
-      respond_with(@object) do |format|
-        format.html { redirect_to collection_url }
-      end
-    end
-  end
-
-  protected
-
-  class << self
-    attr_accessor :parent_data
-    attr_accessor :callbacks
-
-    def belongs_to(model_name, options = {})
-      @parent_data ||= {}
-      @parent_data[:model_name] = model_name
-      @parent_data[:model_class] = model_name.to_s.classify.constantize
-      @parent_data[:find_by] = options[:find_by] || :id
-    end
-
-    def create
-      @callbacks ||= {}
-      @callbacks[:create] ||= Spree::ActionCallbacks.new
-    end
-
-    def update
-      @callbacks ||= {}
-      @callbacks[:update] ||= Spree::ActionCallbacks.new
-    end
-
-    def destroy
-      @callbacks ||= {}
-      @callbacks[:destroy] ||= Spree::ActionCallbacks.new
-    end
-  end
-
-  def model_class
-    controller_name.classify.constantize
-  end
-
-  def object_name
-    controller_name.singularize
-  end
-
-  def load_resource
-    if member_action?
-      @object ||= load_resource_instance
-      instance_variable_set("@#{object_name}", @object)
-    else
-      @collection ||= collection
-      instance_variable_set("@#{controller_name}", @collection)
-    end
-  end
-
-  def load_resource_instance
-    if new_actions.include?(params[:action].to_sym)
-      build_resource
-    elsif params[:id]
-      find_resource
-    end
-  end
-
-  def parent_data
-    self.class.parent_data
-  end
-
-  def parent
-    if parent_data.present?
-      @parent ||= parent_data[:model_class].where(parent_data[:find_by] => params["#{parent_data[:model_name]}_id"]).first
-      instance_variable_set("@#{parent_data[:model_name]}", @parent)
-    else
-      nil
-    end
-  end
-
-  def find_resource
-    if parent_data.present?
-      parent.send(controller_name).find(params[:id])
-    else
-      model_class.find(params[:id])
-    end
-  end
-
-  def build_resource
-    if parent_data.present?
-      parent.send(controller_name).build(params[object_name])
-    else
-      model_class.new(params[object_name])
-    end
-  end
-
-  def collection
-    return parent.send(controller_name) if parent_data.present?
-
-    if model_class.respond_to?(:accessible_by) && !current_ability.has_block?(params[:action], model_class)
-      model_class.accessible_by(current_ability)
-    else
-      model_class.scoped
-    end
-  end
-
-  def location_after_save
-    collection_url
-  end
-
-  def invoke_callbacks(action, callback_type)
-    callbacks = self.class.callbacks || {}
-    return if callbacks[action].nil?
-    case callback_type.to_sym
-      when :before then callbacks[action].before_methods.each {|method| send method }
-      when :after  then callbacks[action].after_methods.each  {|method| send method }
-      when :fails  then callbacks[action].fails_methods.each  {|method| send method }
-    end
-  end
-
-  # URL helpers
-
-  def new_object_url(options = {})
-    if parent_data.present?
-      new_polymorphic_url([:admin, parent, model_class], options)
-    else
-      new_polymorphic_url([:admin, model_class], options)
-    end
-  end
-
-  def edit_object_url(object, options = {})
-    if parent_data.present?
-      send "edit_admin_#{parent_data[:model_name]}_#{object_name}_url", parent, object, options
-    else
-      send "edit_admin_#{object_name}_url", object, options
-    end
-  end
-
-  def object_url(object = nil, options = {})
-    target = object ? object : @object
-    if parent_data.present?
-      send "admin_#{parent_data[:model_name]}_#{object_name}_url", parent, target, options
-    else
-      send "admin_#{object_name}_url", target, options
-    end
-  end
-
-  def collection_url(options = {})
-    if parent_data.present?
-      polymorphic_url([:admin, parent, model_class], options)
-    else
-      polymorphic_url([:admin, model_class], options)
-    end
-  end
-
-  def collection_actions
-    [:index]
-  end
-
-  def member_action?
-    !collection_actions.include? params[:action].to_sym
-  end
-
-  def new_actions
-    [:new, :create]
-  end
-end

data/lib/dummy_hooks/after_migrate.rb

@@ -1 +0,0 @@
-rake "db:migrate db:seed db:sample", :env => "development"

data/lib/dummy_hooks/after_migrate.rb.sample

@@ -1 +0,0 @@
-rake "db:migrate db:seed db:sample", :env => "development"

data/lib/dummy_hooks/before_migrate.rb

@@ -1,11 +0,0 @@
-# install spree and migrate db
-
-say_status "installing", "spree_core, spree_auth"
-
-run "rake spree_core:install spree_auth:install"
-
-say_status "installing", "spree_essentials"
-run "rails g spree_essentials:install"
-
-copy_file "test.pdf", "public/test.pdf"
-copy_file "test.zip", "public/test.zip"

data/lib/spree_core/action_callbacks.rb

@@ -1,26 +0,0 @@
-module Spree
-  class ActionCallbacks
-    attr_reader :before_methods
-    attr_reader :after_methods
-    attr_reader :fails_methods
-    
-    def initialize
-      @before_methods = []
-      @after_methods = []
-      @fails_methods = []
-    end
-    
-    def before(method)
-      @before_methods << method
-    end
-    
-    def after(method)
-      @after_methods << method
-    end
-    
-    def fails(method)
-      @fails_methods << method
-    end
-  end
-
-end