spree_heroku 0.0.1 → 0.0.2

data/lib/spree_heroku/version.rb

@@ -1,3 +1,3 @@
 module SpreeHeroku
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/spree_heroku.rb

@@ -1,4 +1,48 @@
+require 'spree_core'
+
 module SpreeHeroku
+  class Engine < Rails::Engine
+    config.autoload_paths += %W(#{config.root}/lib)
+    
+    def self.activate
+      aws_s3_file = File.join(::Rails.root.to_s, 'config', 'aws_s3.yml')
+      if File.exists?(aws_s3_file)
+        s3_options = {
+          :storage => "s3",
+          :s3_credentials => aws_s3_file
+        }
+      elsif ENV['S3_KEY'] && ENV['S3_SECRET'] && ENV['S3_BUCKET']
+        s3_options = {
+          :storage => "s3",
+          :s3_credentials => {
+            :access_key_id => ENV['S3_KEY'],
+            :secret_access_key => ENV['S3_SECRET']
+          },
+          :bucket => ENV['S3_BUCKET']
+        }
+      else
+        s3_options = {}
+      end
+      
+      
+      Taxon.class_eval do
+        has_attached_file :icon,
+                      {:styles => { :mini => '32x32>', :normal => '128x128>' },
+                      :default_style => :mini,
+                      :path => "assets/taxons/:id/:style/:basename.:extension"}.merge(s3_options)
+      end
+    
+      Image.class_eval do
+        has_attached_file :attachment, 
+                          {:styles => { :mini => '48x48>', :small => '100x100>', :product => '240x240>', :large => '600x600>' }, 
+                          :default_style => :product,
+                          :path => "assets/products/:id/:style/:basename.:extension"}.merge(s3_options)
+
+      end
+    end
+    config.to_prepare  &method(:activate).to_proc
+  end
+  
   module Rails
     class Railtie < ::Rails::Railtie
       console do
@@ -8,13 +52,7 @@ module SpreeHeroku
       end
       
       initializer "heroku" do
-        aws_s3_file = File.join(File.dirname(__FILE__), '..', 'aws_s3.yml')
-
-        if File.exists?(aws_s3_file)
-          HEROKU_AWS_S3 = YAML.load_file(aws_s3_file)[Rails.env]
-        else
-          HEROKU_AWS_S3 = {}
-        end
+        
       end
 
       

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Cody Swann
@@ -34,11 +34,10 @@ files:
 - MIT-LICENSE
 - README.markdown
 - Rakefile
-- app/models/image.rb
-- app/models/taxon.rb
 - aws_s3.yml.example
 - lib/spree_heroku.rb
 - lib/spree_heroku/version.rb
+- pkg/spree_heroku-0.0.1.gem
 - spec/spec.opts
 - spec/spec_helper.rb
 - spree_heroku.gemspec

data/app/models/image.rb

@@ -1,35 +0,0 @@
-# encoding: utf-8
-class Image < Asset
-  has_attached_file :attachment, 
-                    :styles => { :mini => '48x48>', :small => '100x100>', :product => '240x240>', :large => '600x600>' }, 
-                    :default_style => :product,
-                    :path => "assets/products/:id/:style/:basename.:extension",
-                    :storage => "s3",
-                    :s3_credentials => {
-                      :access_key_id => ENV['S3_KEY']  || HEROKU_AWS_S3['access_key_id'],
-                      :secret_access_key => ENV['S3_SECRET'] || HEROKU_AWS_S3['secret_access_key']
-                    },
-                    :bucket => ENV['S3_BUCKET'] || HEROKU_AWS_S3['bucket']
-
-  # save the w,h of the original image (from which others can be calculated)
-  # we need to look at the write-queue for images which have not been saved yet
-  after_post_process :find_dimensions
-  def find_dimensions
-    temporary = attachment.queued_for_write[:original] 
-    filename = temporary.path unless temporary.nil?
-    filename = attachment.path if filename.blank?
-    geometry = Paperclip::Geometry.from_file(filename)
-    self.attachment_width  = geometry.width
-    self.attachment_height = geometry.height
-  end
-
-  # if there are errors from the plugin, then add a more meaningful message
-  def validate
-    unless attachment.errors.empty?
-      # uncomment this to get rid of the less-than-useful interrim messages
-      # errors.clear 
-      errors.add :attachment, "Paperclip returned errors for file '#{attachment_file_name}' - check ImageMagick installation or image source file."
-      false
-    end
-  end
-end

data/app/models/taxon.rb

@@ -1,54 +0,0 @@
-class Taxon < ActiveRecord::Base
-  acts_as_nested_set :dependent => :destroy
-
-  belongs_to :taxonomy
-  has_and_belongs_to_many :products
-  before_create :set_permalink
-  before_save :ensure_trailing_slash
-
-  validates_presence_of :name
-  has_attached_file :icon,
-                :styles => { :mini => '32x32>', :normal => '128x128>' },
-                :default_style => :mini,
-                :path => "assets/taxons/:id/:style/:basename.:extension",
-                :storage => "s3",
-                :s3_credentials => {
-                  :access_key_id => ENV['S3_KEY']  || HEROKU_AWS_S3['access_key_id'],
-                  :secret_access_key => ENV['S3_SECRET'] || HEROKU_AWS_S3['secret_access_key']
-                },
-                :bucket => ENV['S3_BUCKET'] || HEROKU_AWS_S3['bucket']
-
-  # indicate which filters should be used for a taxon
-  # this method should be customized to your own site
-  include ::ProductFilters  # for detailed defs of filters
-  def applicable_filters
-    fs  = []
-    fs << ProductFilters.taxons_below(self)
-    ## unless it's a root taxon? left open for demo purposes
-    fs += [
-      ProductFilters.price_filter,
-      ProductFilters.brand_filter,
-      ProductFilters.selective_brand_filter(self) ]
-  end
-
-  # Creates permalink based on .to_url method provided by stringx gem
-  def set_permalink
-    if parent_id.nil?
-      self.permalink = name.to_url + "/" if self.permalink.blank?
-    else
-      parent_taxon = Taxon.find(parent_id)
-      self.permalink = parent_taxon.permalink + (self.permalink.blank? ? name.to_url : self.permalink.split("/").last) + "/"
-    end
-  end
-
-  private
-  # obsolete, kept for backwards compat
-  def escape(str)
-    str.blank? ? "" : str.to_url
-  end
-
-  def ensure_trailing_slash
-    set_permalink if self.permalink.blank?
-    self.permalink += "/" unless self.permalink[-1..-1] == "/"
-  end
-end