caboose-cms 0.8.53 → 0.8.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d6a292c4ac56159808f11b271e2bc5073831023
-  data.tar.gz: c355716895d3d3a83ca03bc785c9e6282bad97b8
+  metadata.gz: 52aaaaf1b36fe04e4a238a7eb012bf091ea70dcf
+  data.tar.gz: d144b7f4c53b1e545faf238011a8b05bd76a7496
 SHA512:
-  metadata.gz: bb48e2823390fc25b92f46793fc8c547c434e9cb309724f523abd08d58f1a7ccc58ec07a496c8a35b873810eaec31e760b3e3ac1c336cc600088e623b89a1c7e
-  data.tar.gz: 5403811fd11bd1a05ce3d300fcd27ef97dfca99b0f7c84bc37d556e75cc394f2dbc2dddbef9cd88f0ec80406371d2efeb555d16cd2745361123f1d258ca1532b
+  metadata.gz: 477fb721643da72cb55421bb70444863a708ca51cb30ce5ce8e542e1e261db551fcaeb119c2ba550d8bde5638c9fff85dcd6673054c7147bfae1bc71733c2e11
+  data.tar.gz: 677d0f114bfd8591062f6a3a8dd4d57768e056fa2f3e18bb832921f527ee08bbebebdd486cc419a8399b01ce69a1d87110d9b32787838178a74197c7a9efc962

data/app/controllers/caboose/assets_controller.rb

@@ -2,76 +2,62 @@ module Caboose
   class AssetsController < Caboose::ApplicationController
     layout 'caboose/admin'
     
-    # @route GET /admin/assets/ace
-    def admin_ace
-      return if !user_is_allowed('assets', 'edit')      
-    end
-            
-    # @route GET /admin/assets
-    def admin_index
-      return if !user_is_allowed('assets', 'edit')
-      config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]          
-      bucket = config['bucket']
-      @assets_path = "http://#{bucket}.s3.amazonaws.com/assets"
-    end
-    
-    # @route GET /admin/assets/manifest
-    def admin_manifest
-      return if !user_is_allowed('assets', 'edit')
-      
-      config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]          
-      bucket = config['bucket']
-      resp = HTTParty.get("http://#{bucket}.s3.amazonaws.com/assets/manifest.yml")      
-      str = resp.body             
-      manifest = self.parse_manifest(str, true)
-      
-      render :json => manifest            
-    end
-    
-    def parse_manifest(str, exclude_images = true)
-      lines = str.split("\n")
-      h = {}
-      lines.each_with_index do |line, i|
-        next if i == 0
-        path = line.split(": ").first.split('/')
-        
-        if exclude_images
-          ext = line.split('.')
-          next if ext.count > 0 && ['png','jpg','gif','ico'].include?(ext.last.downcase)
-        end
-        self.verify_path_exists(path, h)
-      end
-      return h
-    end
-    
-    def verify_path_exists(path, h, i = 0)
-      return if i >= path.count
-      h[path[i]] = i == (path.count - 1) ? true : {} if h[path[i]].nil?
-      self.verify_path_exists(path, h[path[i]], i+1)
-    end
-    
-    # @route PUT /admin/assets
-    #def admin_update
+    ## @route GET /admin/assets/ace
+    #def admin_ace
+    #  return if !user_is_allowed('assets', 'edit')      
+    #end
+    #        
+    ## @route GET /admin/assets
+    #def admin_index
+    #  return if !user_is_allowed('assets', 'edit')
+    #  config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]          
+    #  bucket = config['bucket']
+    #  @assets_path = "http://#{bucket}.s3.amazonaws.com/assets"
+    #end
+    #
+    ## @route GET /admin/assets/manifest
+    #def admin_manifest
     #  return if !user_is_allowed('assets', 'edit')
     #  
-    #  resp = Caboose::StdClass.new      
-    #  path = params[:path]
-    #  value = parasm[:value]
-    #  
-    #  
-    #  config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]                      
-    #  AWS.config({ :access_key_id => config['access_key_id'], :secret_access_key => config['secret_access_key'] })
-    #  bucket = AWS::S3::Bucket.new(config['bucket'])                      
-    #  obj = bucket.objects[path]
+    #  config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]          
+    #  bucket = config['bucket']
+    #  resp = HTTParty.get("http://#{bucket}.s3.amazonaws.com/assets/manifest.yml")      
+    #  str = resp.body             
+    #  manifest = self.parse_manifest(str, true)
     #  
-    #  if obj.nil?
-    #    resp.error = "Can't find file."
-    #  #elsif !obj.write(value)
-    #  #  resp.error = "Can't write to file."
-    #  else
-    #    resp.success = true
+    #  render :json => manifest            
+    #end
+    #
+    #def parse_manifest(str, exclude_images = true)
+    #  lines = str.split("\n")
+    #  h = {}
+    #  lines.each_with_index do |line, i|
+    #    next if i == 0
+    #    path = line.split(": ").first.split('/')
+    #    
+    #    if exclude_images
+    #      ext = line.split('.')
+    #      next if ext.count > 0 && ['png','jpg','gif','ico'].include?(ext.last.downcase)
+    #    end
+    #    self.verify_path_exists(path, h)
     #  end
+    #  return h
+    #end
+    #
+    #def verify_path_exists(path, h, i = 0)
+    #  return if i >= path.count
+    #  h[path[i]] = i == (path.count - 1) ? true : {} if h[path[i]].nil?
+    #  self.verify_path_exists(path, h[path[i]], i+1)
+    #end
+    #
+    ## @route PUT /admin/assets
+    #def admin_update
+    #  return if !user_is_allowed('assets', 'edit')
+    #              
+    #  path = params[:path]
+    #  value = params[:value]
     #  
+    #  resp = AssetManifest.save_asset(path, value)                  
     #  render :json => resp      
     #end
 

data/app/controllers/caboose/checkout_controller.rb

@@ -140,11 +140,18 @@ module Caboose
       end
       
       if c.nil?
-        c = Stripe::Customer.create(
-          :source => params[:token],
-          :email => u.email,
-          :metadata => { :user_id => u.id }          
-        )
+        begin
+          c = Stripe::Customer.create(
+            :source => params[:token],
+            :email => u.email,
+            :metadata => { :user_id => u.id }          
+          )
+        rescue Stripe::CardError => e
+          render :json => {
+            :error => e.message
+          }
+          return
+        end          
       end
       
       u.stripe_customer_id = c.id

data/app/models/caboose/asset_manifest.rb

@@ -1,27 +1,75 @@
 module Caboose
-  class AssetManifest < ActiveRecord::Base
-    self.table_name = "asset_manifests"  
-    attr_accessible :id, :name
+  class AssetManifest
     
-    #def save_asset(path, value)
-    #  resp = StdClass.new
+    #def AssetManifest.bucket
+    #  if @@bucket.nil?        
+    #    config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]                      
+    #    AWS.config({ :access_key_id => config['access_key_id'], :secret_access_key => config['secret_access_key'] })
+    #    @@bucket = AWS::S3::Bucket.new(config['bucket'])
+    #  end
+    #  return @@bucket
+    #end
+    #    
+    #def AssetManifest.save_asset(path, str, reset = true)
+    #
+    #  file = self.bucket.objects[path]      
+    #  return { :error => "Can't find file." } if file.nil?
+    #                        
+    #  # Save the contents into the source file
+    #  return { :error => "Can't write to file." } if !file.write(str)
+    #  
+    #  # Compile the file
+    #  str_compiled = Uglifier.compile(str)
+    #  
+    #  # Compute the digest for the compiled file            
+    #  digest = Digest::SHA2.hexdigest(str_compiled)
     #  
-    #  config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]                      
-    #  AWS.config({ :access_key_id => config['access_key_id'], :secret_access_key => config['secret_access_key'] })
-    #  bucket = AWS::S3::Bucket.new(config['bucket'])                      
-    #  obj = bucket.objects[path]
+    #  # See if the digest file for the compiled file exists
+    #  digest_path = self.path_with_digest(path, digest)
+    #  if self.bucket.objects[digest_path].exists?
+    #    digest_file = bucket.objects[digest_path]
+    #    digest_file.write(str_compiled)
+    #  end
     #  
-    #  return { :error => "Can't find file."     } if obj.nil?
-    #  return { :error => "Can't write to file." } if !obj.write(value)
+    #  # See if the digest is in the manifest
+    #  manifest = self.bucket.objects['assets/manifest.yml']
+    #  changed = false
+    #  new_lines = []
+    #  manifest.read.split("\n").each do|line|
+    #    if line.starts_with?("#{path}: ") && line != "#{path}: #{digest_path}"
+    #      new_lines << "#{path}: #{digest_path}"
+    #      changed = true
+    #    else
+    #      new_lines << line
+    #    end
+    #  end
     #  
-    #  # Compile the new file      
-    #  dest = "#{Rails.root}/vendor/assets/javascripts/compiled/"
-    #  filename = path.split('/').pop
-    #  ext = filename.split('.').pop
-    #  File.write(dest + js_asset, Uglifier.compile(Rails.application.assets.find_asset(js_asset).to_s))
+    #  # If the digest has changed, update the manifest and set the app asset digests
+    #  if changed
+    #    manifest.write(new_lines.join("\n"))        
+    #    self.reset_asset_digests(new_lines) if reset
+    #  end
+    #  
+    #  return { :sucess => true }
+    #end
+    #
+    #def AssetManifest.reset_asset_digests(lines = nil)
+    #  lines = self.bucket.objects['assets/manifest.yml'].read.split("\n") if lines.nil?       
+    #  lines.each do|line|                  
+    #    arr = line.split(": ")                    
+    #    Rails.application.config.assets.digests[arr[0]] = arr[1]                
+    #  end            
+    #end
     #
+    #def AssetManifest.path_with_digest(path, digest)
+    #  arr = path.split('/')
+    #  filename = arr.pop
+    #  filename = filename.split('.')
+    #  ext = filename.pop
+    #  filename = "#{filename.join('.')}-#{digest}.#{ext}"
+    #  return filename if arr.count == 0
+    #  return "#{arr.join('/')}/#{filename}"
     #end
-      
 
   end
 end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.53'
+  VERSION = '0.8.54'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.8.53
+  version: 0.8.54
 platform: ruby
 authors:
 - William Barry