orange-more 0.6.0 → 0.6.2

data/lib/orange-more/administration/base.rb

@@ -0,0 +1,8 @@
+require 'orange-more/administration/cartons/site'
+require 'orange-more/administration/cartons/site_carton'
+require 'orange-more/administration/cartons/user'
+require 'orange-more/administration/resources/site_resource'
+require 'orange-more/administration/resources/user_resource'
+require 'orange-more/administration/resources/admin_resource'
+require 'orange-more/administration/middleware/access_control'
+require 'orange-more/administration/middleware/site_load'

data/lib/orange-more/administration/middleware/access_control.rb

@@ -77,6 +77,7 @@ module Orange::Middleware
     end
     
     def main_user?(packet)
+      return false if packet['user.id'].blank?
       id = packet['user.id'].gsub(/^https?:\/\//, '').gsub(/\/$/, '')
       users = orange.options['main_users'] || []
       users = users.dup.push(orange.options['main_user'])

data/lib/orange-more/administration/plugin.rb

@@ -1,7 +1,4 @@
-require (File.join(File.dirname(__FILE__), 'cartons', 'site.rb'))
-Dir.glob(File.join(File.dirname(__FILE__), 'cartons', '*.rb')).each {|f| require f }
-Dir.glob(File.join(File.dirname(__FILE__), 'resources', '*.rb')).each {|f| require f }
-Dir.glob(File.join(File.dirname(__FILE__), 'middleware', '*.rb')).each {|f| require f }
+require 'orange-more/administration/base'
 
 module Orange::Plugins
   class Administration < Base

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

@@ -0,0 +1,2 @@
+require 'orange-more/analytics/resources/analytics_resource'
+require 'orange-more/analytics/middleware/analytics'

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

@@ -1,5 +1,4 @@
-Dir.glob(File.join(File.dirname(__FILE__), 'resources', '*.rb')).each {|f| require f }
-Dir.glob(File.join(File.dirname(__FILE__), 'middleware', '*.rb')).each {|f| require f }
+require 'orange-more/analytics/base'
 
 module Orange::Plugins
   class Analytics < Base

data/lib/orange-more/assets/base.rb

@@ -0,0 +1,2 @@
+require 'orange-more/assets/cartons/asset_carton'
+require 'orange-more/assets/resources/asset_resource'

data/lib/orange-more/assets/plugin.rb

@@ -1,5 +1,4 @@
-Dir.glob(File.join(File.dirname(__FILE__), 'cartons', '*.rb')).each {|f| require f }
-Dir.glob(File.join(File.dirname(__FILE__), 'resources', '*.rb')).each {|f| require f }
+require 'orange-more/assets/base'
 
 module Orange::Plugins
   class Assets < Base

data/lib/orange-more/blog/base.rb

@@ -0,0 +1,4 @@
+require 'orange-more/blog/cartons/blog'
+require 'orange-more/blog/cartons/blog_post'
+require 'orange-more/blog/resources/blog_resource'
+require 'orange-more/blog/resources/blog_post_resource'

data/lib/orange-more/blog/plugin.rb

@@ -1,5 +1,4 @@
-Dir.glob(File.join(File.dirname(__FILE__), 'cartons', '*.rb')).each {|f| require f }
-Dir.glob(File.join(File.dirname(__FILE__), 'resources', '*.rb')).each {|f| require f }
+require 'orange-more/blog/base'
 
 module Orange::Plugins
   class Blog < Base

data/lib/orange-more/cloud/base.rb

@@ -0,0 +1 @@
+require 'orange-more/cloud/resources/cloud_resource'

data/lib/orange-more/cloud/plugin.rb

@@ -1,4 +1,4 @@
-Dir.glob(File.join(File.dirname(__FILE__), 'resources', '*.rb')).each {|f| require f }
+require 'orange-more/cloud/base'
 
 module Orange::Plugins
   class Cloud < Base

data/lib/orange-more/contactforms/base.rb

@@ -0,0 +1,2 @@
+require 'orange-more/contactforms/cartons/contactform_carton'
+require 'orange-more/contactforms/contactform_resource'

data/lib/orange-more/contactforms/plugin.rb

@@ -1,5 +1,4 @@
-Dir.glob(File.join(File.dirname(__FILE__), 'cartons', '*.rb')).each {|f| require f }
-Dir.glob(File.join(File.dirname(__FILE__), 'resources', '*.rb')).each {|f| require f }
+require 'orange-more/contactforms/base'
 
 module Orange::Plugins
   class ContactForms < Base

data/lib/orange-more/debugger/base.rb

@@ -0,0 +1 @@
+require 'orange-more/debugger/middleware/debugger'

data/lib/orange-more/debugger/plugin.rb

@@ -1,5 +1,4 @@
-Dir.glob(File.join(File.dirname(__FILE__), 'middleware', '*.rb')).each {|f| require f }
-
+require 'orange-more/debugger/base'
 module Orange::Plugins
   class Debugger < Base
     views_dir  File.join(File.dirname(__FILE__), 'views')

data/lib/orange-more/disqus/base.rb

@@ -0,0 +1 @@
+require 'orange-more/disqus/resources/disqus_resource'

data/lib/orange-more/disqus/plugin.rb

@@ -1,4 +1,4 @@
-Dir.glob(File.join(File.dirname(__FILE__), 'resources', '*.rb')).each {|f| require f }
+require 'orange-more/disqus/base'
 
 module Orange::Plugins
   class Disqus < Base

data/lib/orange-more/news/base.rb

@@ -0,0 +1,2 @@
+require 'orange-more/news/resources/news_resource'
+require 'orange-more/news/cartson/news'

data/lib/orange-more/news/plugin.rb

@@ -1,5 +1,4 @@
-Dir.glob(File.join(File.dirname(__FILE__), 'cartons', '*.rb')).each {|f| require f }
-Dir.glob(File.join(File.dirname(__FILE__), 'resources', '*.rb')).each {|f| require f }
+require 'orange-more/news/base'
 
 module Orange::Plugins
   class News < Base

data/lib/orange-more/pages/base.rb

@@ -0,0 +1,4 @@
+require 'orange-more/pages/cartons/page_carton'
+require 'orange-more/pages/cartons/page_version_carton'
+require 'orange-more/pages/middleware/dumb_quotes'
+require 'orange-more/pages/resources/page_resource'

data/lib/orange-more/pages/middleware/dumb_quotes.rb

@@ -0,0 +1,53 @@
+require 'orange-core/middleware/base'
+
+module Orange::Middleware
+  class DumbQuotes < Base
+    
+    # Passes packet then parses the return
+    def packet_call(packet)
+      no_smart_quotes! packet
+      pass packet
+    end
+    
+    def no_smart_quotes!(packet)
+      deep_clean(packet.request.params) { |s| clean!(s) }
+    end
+    
+    def deep_clean(hash, &block)
+      if hash.instance_of? String
+        yield(hash)
+      elsif hash.kind_of? Hash
+        hash.each_key { |h| deep_clean(hash[h]) { |s| block.call(s) } }
+      else
+        nil
+      end
+    end
+    
+    def clean!(string)
+      string.gsub! "\342\200\230", "'"
+      string.gsub! "\342\200\231", "'"
+      string.gsub! "\342\200\234", '"'
+      string.gsub! "\342\200\235", '"'
+      string.gsub! "\342\200\230", "'"
+      string.gsub! "\342\200\231", "'"
+      string.gsub! "\xE2\x80\x93", '-'
+      string.gsub! "\xE2\x80\x94", '--'
+      string.gsub!(/\x82/,',')
+      string.gsub!(/\x84/,',,')
+      string.gsub!(/\x85/,'...')
+      string.gsub!(/\x88/,'^')
+      string.gsub!(/\x89/,'o/oo')
+      string.gsub!(/\x8b/,'<')
+      string.gsub!(/\x8c/,'OE')
+      string.gsub!(/\x91|\x92/,"'")
+      string.gsub!(/\x93|\x94/,'"')
+      string.gsub!(/\x95/,'*')
+      string.gsub!(/\x96/,'-')
+      string.gsub!(/\x97/,'--')
+      string.gsub!(/\x98/,'~')
+      string.gsub!(/\x99/,'TM')
+      string.gsub!(/\x9b/,'>')
+      string.gsub!(/\x9c/,'oe')
+    end
+  end
+end

data/lib/orange-more/pages/plugin.rb

@@ -1,10 +1,9 @@
-Dir.glob(File.join(File.dirname(__FILE__), 'cartons', '*.rb')).each {|f| require f }
-Dir.glob(File.join(File.dirname(__FILE__), 'resources', '*.rb')).each {|f| require f }
+require 'orange-more/pages/base'
 
 module Orange::Plugins
   class Pages < Base
     views_dir       File.join(File.dirname(__FILE__), 'views')
-    
+    prerouter   Orange::Middleware::DumbQuotes
     resource    Orange::PageResource.new    
   end
 end

data/lib/orange-more/sitemap/base.rb

@@ -0,0 +1,3 @@
+require 'orange-more/sitemap/cartons/route'
+require 'orange-more/sitemap/middleware/flex_router'
+require 'orange-more/sitemap/resources/sitemap_resource'

data/lib/orange-more/sitemap/plugin.rb

@@ -1,6 +1,4 @@
-Dir.glob(File.join(File.dirname(__FILE__), 'cartons', '*.rb')).each {|f| require f }
-Dir.glob(File.join(File.dirname(__FILE__), 'resources', '*.rb')).each {|f| require f }
-Dir.glob(File.join(File.dirname(__FILE__), 'middleware', '*.rb')).each {|f| require f }
+require 'orange-more/sitemap/base'
 
 module Orange::Plugins
   class Sitemap < Base

data/lib/orange-more/slices/base.rb

@@ -0,0 +1,3 @@
+require 'orange-more/slices/middleware/radius_parser'
+require 'orange-more/slices/resources/radius'
+require 'orange-more/slices/resources/slices'

data/lib/orange-more/slices/plugin.rb

@@ -1,5 +1,4 @@
-Dir.glob(File.join(File.dirname(__FILE__), 'resources', '*.rb')).each {|f| require f }
-Dir.glob(File.join(File.dirname(__FILE__), 'middleware', '*.rb')).each {|f| require f }
+require 'orange-more/slices/base'
 
 module Orange::Plugins
   class Slices < Base    

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: orange-more
 version: !ruby/object:Gem::Version 
-  hash: 7
   prerelease: false
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - David Haslem
@@ -15,18 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 -04:00
+date: 2010-08-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: orange-core
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 0
         - 5
@@ -38,11 +35,9 @@ dependencies:
   name: dm-is-awesome_set
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 51
         segments: 
         - 0
         - 11
@@ -54,11 +49,9 @@ dependencies:
   name: dm-timestamps
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
@@ -70,11 +63,9 @@ dependencies:
   name: rack-openid
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -84,11 +75,9 @@ dependencies:
   name: openid_dm_store
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -98,11 +87,9 @@ dependencies:
   name: radius
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -112,11 +99,9 @@ dependencies:
   name: rest-client
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -126,11 +111,9 @@ dependencies:
   name: mail
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -140,11 +123,9 @@ dependencies:
   name: gattica
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -154,11 +135,9 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -168,11 +147,9 @@ dependencies:
   name: rack-test
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -194,6 +171,7 @@ files:
 - lib/orange-more/administration/assets/css/blueprint-print.css
 - lib/orange-more/administration/assets/css/blueprint.css
 - lib/orange-more/administration/assets/js/jquery.js
+- lib/orange-more/administration/base.rb
 - lib/orange-more/administration/cartons/site.rb
 - lib/orange-more/administration/cartons/site_carton.rb
 - lib/orange-more/administration/cartons/user.rb
@@ -208,10 +186,12 @@ files:
 - lib/orange-more/administration/views/users/create.haml
 - lib/orange-more/administration/views/users/edit.haml
 - lib/orange-more/analytics.rb
+- lib/orange-more/analytics/base.rb
 - lib/orange-more/analytics/middleware/analytics.rb
 - lib/orange-more/analytics/plugin.rb
 - lib/orange-more/analytics/resources/analytics_resource.rb
 - lib/orange-more/assets.rb
+- lib/orange-more/assets/base.rb
 - lib/orange-more/assets/cartons/asset_carton.rb
 - lib/orange-more/assets/plugin.rb
 - lib/orange-more/assets/resources/asset_resource.rb
@@ -219,6 +199,7 @@ files:
 - lib/orange-more/assets/views/assets/create.haml
 - lib/orange-more/assets/views/assets/insert.haml
 - lib/orange-more/blog.rb
+- lib/orange-more/blog/base.rb
 - lib/orange-more/blog/cartons/blog.rb
 - lib/orange-more/blog/cartons/blog_post.rb
 - lib/orange-more/blog/plugin.rb
@@ -231,6 +212,7 @@ files:
 - lib/orange-more/blog/views/blog_posts/edit.haml
 - lib/orange-more/blog/views/blog_posts/show.haml
 - lib/orange-more/cloud.rb
+- lib/orange-more/cloud/base.rb
 - lib/orange-more/cloud/plugin.rb
 - lib/orange-more/cloud/resources/cloud_resource.rb
 - lib/orange-more/contactforms.rb
@@ -239,20 +221,24 @@ files:
 - lib/orange-more/contactforms/assets/js/lib/jquery.form.js
 - lib/orange-more/contactforms/assets/js/lib/jquery.js
 - lib/orange-more/contactforms/assets/js/lib/jquery.metadata.js
+- lib/orange-more/contactforms/base.rb
 - lib/orange-more/contactforms/cartons/contactform_carton.rb
 - lib/orange-more/contactforms/plugin.rb
 - lib/orange-more/contactforms/resources/contactforms_resource.rb
 - lib/orange-more/contactforms/views/contactforms/contactform.haml
 - lib/orange-more/debugger.rb
 - lib/orange-more/debugger/assets/css/debug_bar.css
+- lib/orange-more/debugger/base.rb
 - lib/orange-more/debugger/middleware/debugger.rb
 - lib/orange-more/debugger/plugin.rb
 - lib/orange-more/debugger/views/debug_bar.haml
 - lib/orange-more/disqus.rb
+- lib/orange-more/disqus/base.rb
 - lib/orange-more/disqus/plugin.rb
 - lib/orange-more/disqus/resources/disqus_resource.rb
 - lib/orange-more/disqus/views/disqus/comment_thread.haml
 - lib/orange-more/news.rb
+- lib/orange-more/news/base.rb
 - lib/orange-more/news/cartons/news.rb
 - lib/orange-more/news/plugin.rb
 - lib/orange-more/news/resources/news_resource.rb
@@ -261,8 +247,10 @@ files:
 - lib/orange-more/news/views/news/latest.haml
 - lib/orange-more/news/views/news/sitemap_row.haml
 - lib/orange-more/pages.rb
+- lib/orange-more/pages/base.rb
 - lib/orange-more/pages/cartons/page_carton.rb
 - lib/orange-more/pages/cartons/page_version_carton.rb
+- lib/orange-more/pages/middleware/dumb_quotes.rb
 - lib/orange-more/pages/plugin.rb
 - lib/orange-more/pages/resources/page_resource.rb
 - lib/orange-more/pages/views/pages/edit.haml
@@ -277,6 +265,7 @@ files:
 - lib/orange-more/sitemap/assets/img/sitemap_up.png
 - lib/orange-more/sitemap/assets/img/sitemap_up_d.png
 - lib/orange-more/sitemap/assets/js/sitemap.js
+- lib/orange-more/sitemap/base.rb
 - lib/orange-more/sitemap/cartons/route.rb
 - lib/orange-more/sitemap/middleware/flex_router.rb
 - lib/orange-more/sitemap/plugin.rb
@@ -290,43 +279,12 @@ files:
 - lib/orange-more/sitemap/views/sitemap/table_row.haml
 - lib/orange-more/sitemap/views/sitemap/two_level.haml
 - lib/orange-more/slices.rb
+- lib/orange-more/slices/base.rb
 - lib/orange-more/slices/middleware/radius_parser.rb
 - lib/orange-more/slices/plugin.rb
 - lib/orange-more/slices/resources/radius.rb
 - lib/orange-more/slices/resources/slices.rb
 - README.markdown
-- spec/orange-core/application_spec.rb
-- spec/orange-core/carton_spec.rb
-- spec/orange-core/core_spec.rb
-- spec/orange-core/magick_spec.rb
-- spec/orange-core/middleware/base_spec.rb
-- spec/orange-core/middleware/globals_spec.rb
-- spec/orange-core/middleware/rerouter_spec.rb
-- spec/orange-core/middleware/restful_router_spec.rb
-- spec/orange-core/middleware/route_context_spec.rb
-- spec/orange-core/middleware/route_site_spec.rb
-- spec/orange-core/middleware/show_exceptions_spec.rb
-- spec/orange-core/middleware/static_file_spec.rb
-- spec/orange-core/middleware/static_spec.rb
-- spec/orange-core/mock/mock_app.rb
-- spec/orange-core/mock/mock_carton.rb
-- spec/orange-core/mock/mock_core.rb
-- spec/orange-core/mock/mock_middleware.rb
-- spec/orange-core/mock/mock_mixins.rb
-- spec/orange-core/mock/mock_model_resource.rb
-- spec/orange-core/mock/mock_pulp.rb
-- spec/orange-core/mock/mock_resource.rb
-- spec/orange-core/mock/mock_router.rb
-- spec/orange-core/orange_spec.rb
-- spec/orange-core/packet_spec.rb
-- spec/orange-core/resource_spec.rb
-- spec/orange-core/resources/mapper_spec.rb
-- spec/orange-core/resources/model_resource_spec.rb
-- spec/orange-core/resources/parser_spec.rb
-- spec/orange-core/resources/routable_resource_spec.rb
-- spec/orange-core/spec_helper.rb
-- spec/orange-core/stack_spec.rb
-- spec/stats.rb
 has_rdoc: true
 homepage: http://github.com/therabidbanana/orange
 licenses: []
@@ -337,27 +295,23 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Plugins for Orange