orange 0.3.9 → 0.4.0

data/lib/orange-core/middleware/database.rb

@@ -12,7 +12,7 @@ module Orange::Middleware
       unless orange.options.has_key?('database') && orange.options['database'] == false
         db = orange.options['database'] || 'sqlite3::memory:'
         orange.load_db!(db) 
-        orange.upgrade_db! unless @options[:no_auto_upgrade]
+        orange.upgrade_db! unless @options[:no_auto_upgrade] || orange.options['db_no_auto_upgrade']
       end
     end
     

data/lib/orange-more/analytics/middleware/analytics.rb

@@ -21,7 +21,7 @@ module Orange::Middleware
             })();
 
           </script>"
-          packet[:content] = packet[:content].sub(/.*<\/body>$/, ga + '</body>')
+          packet[:content] = packet[:content].sub(/.*<\/head>$/, ga + '</head>')
       end
       packet.finish
     end

data/lib/orange-more/analytics/resources/analytics_resource.rb

@@ -13,7 +13,7 @@ module Orange
       @gattica ||= Gattica.new(options)
     end
     
-    def pageviews(route)
+    def pageviews(route, opts = {})
       return "No GA" unless gattica
       r = route.to_s
       # Strip of trailing slash if present. GA doesn't like it.
@@ -30,7 +30,7 @@ module Orange
                       :dimensions => ['pagePath'],
                       :metrics => ['pageviews'],
                       :filters => ['pagePath == '+route.to_s[0..-1]]
-                      })
+                      }.merge(opts))
       unless data.points.length == 0
         views = data.points[0].metrics[0][:pageviews]
         views 

data/lib/orange-more/cloud/resources/cloud_resource.rb

@@ -6,10 +6,11 @@ module Orange
     call_me :cloud
     def stack_init
       options[:ping_fm_key] = orange.options['ping_fm_key'] || false
+      options[:ping_fm_app_key] = orange.options['ping_fm_app_key'] || false
     end
     
     def microblog(packet, status, opts = {})
-      params = {    :api_key => ORANGE_PING_KEY, 
+      params = {    :api_key => options[:ping_fm_app_key] || ORANGE_PING_KEY, 
                     :user_app_key => options[:ping_fm_key], 
                     :post_method => "microblog",
                     :body => status}.merge(opts)

data/lib/orange-more/events/resources/event_resource.rb

@@ -52,7 +52,7 @@ module Orange
         emails = event.attendees.map{|a| a.email}
         orange[:members, true].batch_update_interest_mailchimp(packet, emails, "Eventbrite Attendee", "#{event.title} - #{event.id}")
       end
-      packet.reroute(@my_orange_name, :orange, packet['route.resource_id']) unless no_reroute
+      packet.reroute(@my_orange_name, :orange, packet['route.resource_id'], 'edit') unless no_reroute
     end
     
     # Todo - eventbrite crashes when date in past

data/lib/orange-more/sitemap/resources/sitemap_resource.rb

@@ -84,6 +84,7 @@ module Orange
       no_reroute = opts.delete(:no_reroute)
       if packet.request.post? || !opts.blank?
         dir = opts[:direction]
+        dir = {:into => opts[:parent]} if (dir == :into)
         obj ||= find_one(packet, :move, (opts[:id] || packet['route.resource_id']))
         obj.move(dir) if obj
       end
@@ -114,6 +115,12 @@ module Orange
       move(packet, false, :direction => :higher)
     end
     
+    def into(packet, opts = {})
+      opts[:parent_id] ||= packet['route.resource_path'].split('/').last
+      opts[:parent] = find_one(packet, :move, (opts[:parent_id])) unless opts[:parent]
+      move(packet, false, :direction => :into, :parent => opts[:parent])
+    end
+    
     def lower(packet, opts = {})
       move(packet, false, :direction => :lower)
     end

data/lib/orange-more/testimonials/resources/testimonials_resource.rb

@@ -20,6 +20,10 @@ module Orange
       end
     end
     
+    def afterNew(packet, obj, params = {})
+      obj.orange_site = packet['subsite'].blank? ? packet['site'] : packet['subsite']
+    end
+    
     def for_site(packet, opts = {})
       site_filtered = model_class.all(:orange_site => packet['subsite'].blank? ? packet['site'] : packet['subsite'])
       if site_filtered.count > 0

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 9
-  version: 0.3.9
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - David Haslem