spree_essentials 0.4.0.rc2 → 0.4.0.rc3

data/app/assets/javascripts/admin/spree_essentials.js

@@ -0,0 +1 @@
+//= require_tree .

data/app/assets/stylesheets/{markitup.css.erb → admin/markitup.css.erb}

@@ -2,6 +2,11 @@
 // markItUp! Universal MarkUp Engine, JQuery plugin
 // By Jay Salvat - http://markitup.jaysalvat.com/
 // ------------------------------------------------------------------*/
+
+.markdown-helper {
+  margin-left: 1em;
+}
+
 .markItUp * {
 	margin:0px; padding:0px;
 	outline:none;

data/app/assets/stylesheets/admin/spree_essentials.css

@@ -0,0 +1,3 @@
+/*
+*= require_tree ./
+*/

data/app/controllers/spree/admin/markdown_controller.rb

@@ -4,4 +4,4 @@ class Spree::Admin::MarkdownController < Spree::Admin::BaseController
     render :text => RDiscount.new(params[:data].to_s).to_html
   end 
 
-end
+end

data/app/controllers/spree/admin/uploads_controller.rb

@@ -6,10 +6,6 @@ class Spree::Admin::UploadsController < Spree::Admin::ResourceController
   
   private
   
-    def translated_object_name
-      I18n.t("upload.model_name")
-    end
-   
     def collection
       params[:search] ||= {}
       params[:search][:meta_sort] ||= "created_at.desc"

data/app/helpers/spree/admin/spree_essentials_helper.rb

@@ -1,25 +1,31 @@
 module Spree::Admin::SpreeEssentialsHelper
   
+  def inside_contents_tab?
+    @inside_contents_tab ||= !request.fullpath.scan(Regexp.new(extension_routes.join("|"))).empty?
+  end
+  
   def contents_tab
-    routes = SpreeEssentials.essentials.map do |key, cls|
-      route = cls.tab[:route] || "admin_#{key}"
-      send("#{route}_path") rescue "##{key}"
-    end
-    routes.push admin_uploads_path
-    cls = request.path.scan(Regexp.new(routes.join("|"))).empty? ? nil : 'selected'
-    content_tag :li, :class => cls do
-      link_to I18n.t('spree.admin.shared.contents_tab.content'), routes.first
+    content_tag :li, :class => inside_contents_tab? ? 'selected' : nil do
+      link_to I18n.t('spree.admin.shared.contents_tab.content'), extension_routes.first
     end
   end
   
   def markdown_helper
-    content_tag('em', :class => 'small') do
+    content_tag('em', :class => 'small markdown-helper') do
       [ 
-       " ",
         t('essentials.parsed_with'),
         link_to("Markdown", "http://daringfireball.net/projects/markdown/basics", :onclick => 'window.open(this.href); return false')
       ].join(" ").html_safe
     end
   end
+
+private
+  
+  def extension_routes
+    @extension_routes ||= SpreeEssentials.essentials.map { |key, cls|
+      route = cls.tab[:route] || "admin_#{key}"
+      send("#{route}_path") rescue "##{key}"      
+    }.push(spree.admin_uploads_path)    
+  end
   
 end

data/app/models/spree/upload.rb

@@ -5,9 +5,11 @@ class Spree::Upload < ::Spree::Asset
   validate :no_attachement_errors
   
   has_attached_file :attachment,
-    :styles => Proc.new{ |clip| clip.instance.attachment_sizes },
-    :default_style => :medium
-    
+    :styles        => Proc.new{ |clip| clip.instance.attachment_sizes },
+    :default_style => :medium,
+    :url           => "/spree/uploads/:id/:style/:basename.:extension",
+    :path          => ":rails_root/public/spree/uploads/:id/:style/:basename.:extension"
+  
   def image_content?
     attachment_content_type.match(/\/(jpeg|png|gif|tiff|x-photoshop)/)
   end

data/app/overrides/admin/spree_essentials.rb

@@ -0,0 +1,13 @@
+# Adds the Content button to the admin tabs
+Deface::Override.new(:virtual_path  => "spree/layouts/admin",
+                     :name          => "spree_essential_admin_tabs",
+                     :insert_bottom => "[data-hook='admin_tabs'], #admin_tabs[data-hook]",
+                     :partial       => "spree/admin/shared/contents_tab",
+                     :disabled      => false)
+
+# Adds the contents menu. Inside the contents sub menu we ensure it's needed
+Deface::Override.new(:virtual_path  => "spree/layouts/admin",
+                     :name          => "spree_essential_contents_menu",
+                     :insert_top    => "#sub-menu[data-hook]",
+                     :partial       => "spree/admin/shared/contents_sub_menu",
+                     :disabled      => false)

data/app/views/spree/admin/shared/_contents_sub_menu.html.erb

@@ -1,8 +1,10 @@
-<% content_for :sub_menu do %>
-  <ul id="sub_nav" data-hook="essentials_sub_nav">
-    <% SpreeEssentials.essentials.each_pair do |name, cls| %>
-      <%= tab *cls.sub_tab if defined?(cls.sub_tab) %>
-    <% end %>
-    <%= tab :uploads, :label => 'spree.admin.subnav.uploads' %>
-  </ul>
+<% if inside_contents_tab? %>
+  <% content_for :sub_menu do %>
+    <ul id="sub_nav" data-hook="essentials_sub_nav">
+      <% SpreeEssentials.essentials.each_pair do |name, cls| %>
+        <%= tab *cls.sub_tab if defined?(cls.sub_tab) %>
+      <% end %>
+      <%= tab :uploads, :label => 'spree.admin.subnav.uploads' %>
+    </ul>
+  <% end %>
 <% end %>

data/app/views/spree/admin/uploads/edit.html.erb

@@ -1,5 +1,3 @@
-<%= render :partial => "spree/admin/shared/contents_sub_menu" %>
-
 <h1><%= t('.edit_upload') %></h1>
 
 <% if @upload.try(:errors).present? %>

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

@@ -1,4 +1,3 @@
-<%= render :partial => "spree/admin/shared/contents_sub_menu" %>
 
 <h1><%= t('.listing_uploads') %></h1>
 

data/app/views/spree/admin/uploads/new.html.erb

@@ -1,5 +1,3 @@
-<%= render :partial => "spree/admin/shared/contents_sub_menu" unless request.xhr? %>
-
 <h3><%= t('.new_upload') %></h3>
 
 <% if @upload.try(:errors).present? %>

data/config/routes.rb

@@ -1,6 +1,7 @@
+#Rails.application
 Spree::Core::Engine.routes.draw do
-  namespace :admin do 
-    post "/markdown/preview" => "markdown#preview"
-    resources :uploads        
-  end  
+  namespace :admin do
+    post "/markdown/preview" => "markdown#preview", :as => :markdown_preview
+    resources :uploads
+  end
 end

data/lib/generators/spree_essentials/install_generator.rb

@@ -1,16 +1,26 @@
-require 'generators/essentials_base'
-
 module SpreeEssentials
   module Generators
-    class InstallGenerator < SpreeEssentials::Generators::EssentialsBase
+    class InstallGenerator < Rails::Generators::Base
       
       desc "Installs required migrations for spree_essentials"
-      source_root File.expand_path("../../templates/db/migrate", __FILE__)
+      
+      class_option :add_stylesheets, :type => :boolean, :default => true, :banner => 'Append spree_essentials to admin/all.css'
+      class_option :add_javascripts, :type => :boolean, :default => true, :banner => 'Append spree_essentials to admin/all.js'
       
       def copy_migrations
-        migration_template "add_attachment_file_size_to_assets.rb", "db/migrate/add_attachment_file_size_to_assets.rb"
+        rake "spree_essentials:install:migrations"
+      end
+      
+      def append_stylesheets
+        return unless options[:add_stylesheets]
+        gsub_file "app/assets/stylesheets/admin/all.css", "*/", "*= require admin/spree_essentials\n*/"  
+      end
+      
+      def append_javascripts
+        return unless options[:add_javascripts]
+        append_file "app/assets/javascripts/admin/all.js", "//= require admin/spree_essentials"
       end
 
     end
   end
-end
+end

data/lib/spree_essentials.rb

@@ -1,5 +1,8 @@
-require 'spree_core'
-require 'rdiscount'
+require "spree_core"
+require "rdiscount"
+
+require "spree_essentials/version"
+require "spree_essentials/engine"
 
 module SpreeEssentials
   
@@ -22,26 +25,4 @@ module SpreeEssentials
     
   end
   
-  class Engine < Rails::Engine
-
-    config.autoload_paths += %W(#{config.root}/lib)
-    
-    initializer :assets do |config| 
-      Rails.application.config.assets.precompile += %w( markitup.css date.js jquery.autodate.js jquery.markitup.js markdown.set.js )
-    end
-        
-    config.to_prepare do
-      #loads application's model / class decorators
-      Dir.glob File.expand_path("../../app/**/*_decorator.rb", __FILE__) do |c|
-        Rails.configuration.cache_classes ? require(c) : load(c)
-      end
-
-      #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

data/lib/spree_essentials/engine.rb

@@ -0,0 +1,25 @@
+module SpreeEssentials
+  class Engine < Rails::Engine
+
+    engine_name "spree_essentials"
+
+    config.autoload_paths += %W(#{config.root}/lib)
+    
+    initializer :assets do |config| 
+      Rails.application.config.assets.precompile += %w( admin/markitup.css admin/date.js admin/jquery.autodate.js admin/jquery.markitup.js admin/markdown.set.js )
+    end
+    
+    config.to_prepare do
+      #loads application's model / class decorators
+      Dir.glob File.expand_path("../../../app/**/*_decorator.rb", __FILE__) do |c|
+        Rails.configuration.cache_classes ? require(c) : load(c)
+      end
+
+      #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

data/lib/spree_essentials/{test_helper.rb → testing/integration_case.rb}

@@ -1,37 +1,13 @@
-require "rails/test_help"
-require "shoulda"
-require "factory_girl"
-require "sqlite3"
-
-ActionMailer::Base.delivery_method    = :test
-ActionMailer::Base.perform_deliveries = true
-ActionMailer::Base.default_url_options[:host] = "example.com"
-
-Rails.backtrace_cleaner.remove_silencers!
-
-# Configure capybara for integration testing
 require "capybara/rails"
 require "selenium/webdriver"
 
-Capybara.default_driver   = :selenium
-Capybara.default_selector = :css
-
+class SpreeEssentials::IntegrationCase < ActiveSupport::TestCase
 
-# Define a bare test case to use with Capybara
-class ActiveSupport::IntegrationCase < ActiveSupport::TestCase
-  
   include Capybara::DSL
-  include Spree::Core::Engine.routes.url_helpers
-
-  
-  # Extreme hax! wtf is this for anyways.. and why is it erroring?
-  def testmail_admin_mail_method_url(*args)
-    "#wtf"  
-  end
-  alias :testmail_admin_mail_method_path :testmail_admin_mail_method_url
-  
-  
     
+  Capybara.default_driver   = :selenium
+  Capybara.default_selector = :css
+
   self.use_transactional_fixtures = false
 
   # Checks for missing translations after each test
@@ -42,18 +18,25 @@ class ActiveSupport::IntegrationCase < ActiveSupport::TestCase
     end
   end
   
+  # By defining this we don't need to depend on spree, just spree_core since the
+  # included url helper lives in the spree root
+  def spree
+    Spree::Core::Engine.routes.url_helpers
+  end
+  
   # An assertion for ensuring content has made it to the page.
   #    
   #    assert_seen "Site Title"
   #    assert_seen "Peanut Butter Jelly Time", :within => ".post-title h1"
   #      
   def assert_seen(text, opts={})
+    msg = "Should see `#{text}`"
     if opts[:within]
       within(opts[:within]) do
-        assert has_content?(text)
+        assert has_content?(text), msg + " within #{opts[:within]}"
       end
     else
-      assert has_content?(text)
+      assert has_content?(text), msg
     end
   end
   

data/lib/spree_essentials/testing/test_helper.rb

@@ -0,0 +1,30 @@
+RAILS_ROOT = ENV["RAILS_ROOT"]
+if RAILS_ROOT.nil?
+  puts 'Please specify ENV["RAILS_ROOT"] before `require "spree_essentials/testing/test_helper"`'
+  exit
+end
+
+@env = File.join(RAILS_ROOT, "config/environment.rb")
+if File.exists?(@env)
+  require @env
+else
+  puts "#{@env} does not exist! Ensure that ENV[\"RAILS_ROOT\"] exists or try running `bundle exec dummier`"
+  exit
+end
+
+require "rails/test_help"
+require "shoulda"
+require "paperclip/matchers"
+require "factory_girl"
+require "sqlite3"
+require "ffaker"
+
+ActionMailer::Base.delivery_method    = :test
+ActionMailer::Base.perform_deliveries = true
+ActionMailer::Base.default_url_options[:host] = "example.com"
+
+Rails.backtrace_cleaner.remove_silencers!
+
+class ActiveSupport::TestCase
+  extend Paperclip::Shoulda::Matchers
+end

data/lib/spree_essentials/version.rb

@@ -1,3 +1,3 @@
 module SpreeEssentials
-  VERSION = "0.4.0.rc2"
+  VERSION = "0.4.0.rc3"
 end

data/spree_essentials.gemspec

@@ -0,0 +1,34 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "spree_essentials/version"
+
+Gem::Specification.new do |s|
+
+  s.name        = "spree_essentials"
+  s.version     = SpreeEssentials::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Spencer Steffen"]
+  s.email       = ["spencer@citrusme.com"]
+  s.homepage    = "https://github.com/citrus/spree_essentials"
+  s.summary     = %q{Spree Essentials provides a base for several other Spree Commerce extensions. See readme for details...}
+  s.description = %q{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.}
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  
+  s.require_paths = ["lib"]
+
+  # Spree
+  s.add_runtime_dependency('spree_core',  '~> 1.0.0')
+  s.add_runtime_dependency('rdiscount',   '~> 1.6.8')
+  
+  # Development
+	s.add_development_dependency('shoulda',      '~> 3.0.0')
+	s.add_development_dependency('dummier',      '~> 0.3.0')
+	s.add_development_dependency('factory_girl', '~> 2.6.0')
+	s.add_development_dependency('capybara',     '~> 1.1.2')
+	s.add_development_dependency('sqlite3',      '~> 1.3.4')
+
+	# s.add_development_dependency('simplecov',    '~> 0.6.1')
+	
+end

data/test/dummy_hooks/after_migrate.rb.sample

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

data/test/dummy_hooks/before_migrate.rb

@@ -0,0 +1,30 @@
+# Require spree_essential_example in config/application.rb
+gsub_file "config/application.rb", 'require "spree_essentials"', %(require "spree_essentials"
+require "spree_essential_example")
+
+# Install spree's migrations
+rake "spree:install:migrations"
+
+# Mount the Spree::Core routes
+insert_into_file File.join('config', 'routes.rb'), :after => "Application.routes.draw do\n" do
+  "  # Mount Spree's routes\n  mount Spree::Core::Engine, :at => '/'\n"
+end
+
+# Fix uninitialized constant Spree::User::DestroyWithOrdersError 
+template "spree_user_error_fix.rb", "config/initializers/spree_user_error_fix.rb"
+
+# remove all stylesheets except core  
+%w(admin store).each do |ns|
+  template "#{ns}/all.js",  "app/assets/javascripts/#{ns}/all.js",  :force => true
+  template "#{ns}/all.css", "app/assets/stylesheets/#{ns}/all.css", :force => true
+end
+
+# Fix sass load error by using the converted css file
+template "store/screen.css", "app/assets/stylesheets/store/screen.css"
+
+# Enable forgery_protection since we need AUTH_TOKEN to be defined to avoid JS errors
+gsub_file "config/environments/test.rb", "forgery_protection    = false", "forgery_protection = true"
+
+# Install spree essentials & example extension
+run "bundle exec rails g spree_essentials:install"
+run "bundle exec rails g spree_essentials:example"

data/test/dummy_hooks/templates/admin/all.css

@@ -0,0 +1,3 @@
+/*
+*= require admin/spree_core
+*/

data/test/dummy_hooks/templates/admin/all.js

@@ -0,0 +1 @@
+//= require admin/spree_core