caboose-cms 0.7.71 → 0.7.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ef12fa6392d39fa4faf8be10245f0e0532ce088
-  data.tar.gz: 49253e331627337f49c57c13cb38663876b2d89f
+  metadata.gz: b2e4df79c7201a278945dcce956f6670c8b1113a
+  data.tar.gz: 700a8d557a996d7a8e4d9d72fbb232f8bf4f57cf
 SHA512:
-  metadata.gz: 4a7973212ed78b8282de7dceece1989b2e6efa373b2946657c4f16bfc0674fce4c3111e95b09c63ae53c41e32c0a4d8d3ad4f34b0b84e219affa6407d904ad4a
-  data.tar.gz: d6224a2867094144f871a41eaf098275777082fbf63b3fa39363456e9a81f1c650042fbb0aa98413503daae333ca15a31ad02fa427f6aa5e2f48ecc2d039cdd0
+  metadata.gz: f291b7f39bd93b2e423a8287e4e627156cc915600a3749a675c98852968e039975680ebe9c8e2e2a10b6423ac1ad91bca0e13df3992f952364464a95d418062f
+  data.tar.gz: 8075ccdff11db01e67c3ace26325c55228579c2a1c6f0ef164fd16329f63eb311059d8efe226660c624452e45fd6060117ce6cc2fdbf05a1e2c683f90797e528

data/app/controllers/caboose/store_controller.rb

@@ -63,6 +63,8 @@ module Caboose
           when 'pp_password'               then sc.pp_password               = value
           when 'pp_testing'                then sc.pp_testing                = value
           when 'pp_relay_domain'           then sc.pp_relay_domain           = value
+          when 'stripe_secret_key'         then sc.stripe_secret_key         = value
+          when 'stripe_publishable_key'    then sc.stripe_publishable_key    = value
           when 'ups_username'              then sc.ups_username              = value
           when 'ups_password'              then sc.ups_password              = value
           when 'ups_key'                   then sc.ups_key                   = value

data/app/models/caboose/block.rb

@@ -276,17 +276,41 @@ class Caboose::Block < ActiveRecord::Base
     return erb.result(locals.instance_eval { binding })
   end
   
-  def partial(name, options)    
-    defaults = { :modal => false, :empty_text => '', :editing => false, :css => nil, :js => nil }
-    options2 = nil
+  def partial(name, options)
+    defaults = {
+      :view => nil,
+      :controller_view_content => nil,
+      :modal => false,
+      :empty_text => '',
+      :editing => false,
+      :css => nil,
+      :js => nil,
+      :csrf_meta_tags => nil,
+      :csrf_meta_tags2 => nil,    
+      :logged_in_user => nil
+    }
+    options2 = nil        
     if options.is_a?(Hash)
       options2 = defaults.merge(options)
     else
-      options2 = { :modal => options.modal, :empty_text => options.empty_text, :editing => options.editing, :css => options.css, :js => options.js }        
+      #options2 = { :modal => options.modal, :empty_text => options.empty_text, :editing => options.editing, :css => options.css, :js => options.js }
+      options2 = {
+        :view                    => options.view                    ? options.view                    : nil,
+        :controller_view_content => options.controller_view_content ? options.controller_view_content : nil,
+        :modal                   => options.modal                   ? options.modal                   : nil,
+        :empty_text              => options.empty_text              ? options.empty_text              : nil,
+        :editing                 => options.editing                 ? options.editing                 : nil,
+        :css                     => options.css                     ? options.css                     : nil,
+        :js                      => options.js                      ? options.js                      : nil,
+        :csrf_meta_tags          => options.csrf_meta_tags          ? options.csrf_meta_tags          : nil,
+        :csrf_meta_tags2         => options.csrf_meta_tags2         ? options.csrf_meta_tags2         : nil,
+        :logged_in_user          => options.logged_in_user          ? options.logged_in_user          : nil
+      }
     end
-    options2[:block] = self
+    options2[:block] = block
     
-    view = ActionView::Base.new(ActionController::Base.view_paths)
+    view = options2[:view]     
+    view = ActionView::Base.new(ActionController::Base.view_paths) if view.nil?        
     site = options[:site]
     
     begin

data/app/models/caboose/schema.rb

@@ -734,7 +734,9 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :pp_username               , :string  ],
         [ :pp_password               , :string  ],
         [ :pp_testing                , :boolean , { :default => true }],        
-        [ :pp_relay_domain           , :string  ],                
+        [ :pp_relay_domain           , :string  ],
+        [ :stripe_secret_key         , :string  ],
+        [ :stripe_publishable_key    , :string  ],
         [ :ups_username              , :string  ],
         [ :ups_password              , :string  ],
         [ :ups_key                   , :string  ],

data/app/models/caboose/store_config.rb

@@ -9,7 +9,9 @@ module Caboose
       :pp_username,
       :pp_password,
       :pp_testing,
-      :pp_relay_url,      
+      :pp_relay_url,
+      :stripe_secret_key,
+      :stripe_publishable_key,
       :ups_username,
       :ups_password,
       :ups_key,

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.7.71'
+  VERSION = '0.7.72'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.7.71
+  version: 0.7.72
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg