orange 0.5.5 → 0.5.7

data/lib/orange.rb

@@ -1,5 +1,2 @@
-libdir = File.dirname(__FILE__)
-$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
-
-require File.join(libdir, 'orange-core')
-require File.join(libdir, 'orange-more')
+require 'orange-core'
+require 'orange-more'

data/spec/orange_spec.rb

@@ -0,0 +1,5 @@
+describe "Orange" do
+  it "should be awesome" do
+    
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 5
-  version: 0.5.5
+  - 7
+  version: 0.5.7
 platform: ruby
 authors: 
 - David Haslem
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-11 00:00:00 -04:00
+date: 2010-07-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,21 +32,21 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: haml
+  name: orange-core
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 2
-        - 2
-        - 13
-        version: 2.2.13
+        - 0
+        - 5
+        - 7
+        version: 0.5.7
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: orange-more
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
@@ -54,11 +54,13 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
-  type: :development
+        - 5
+        - 7
+        version: 0.5.7
+  type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
@@ -69,6 +71,18 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: Orange is a Ruby framework for building managed websites with code as simple as Sinatra
 email: therabidbanana@gmail.com
 executables: []
@@ -78,198 +92,6 @@ extensions: []
 extra_rdoc_files: 
 - README.markdown
 files: 
-- lib/orange-core.rb
-- lib/orange-core/application.rb
-- lib/orange-core/assets/css/exceptions.css
-- lib/orange-core/assets/js/exceptions.js
-- lib/orange-core/carton.rb
-- lib/orange-core/core.rb
-- lib/orange-core/magick.rb
-- lib/orange-core/middleware/base.rb
-- lib/orange-core/middleware/database.rb
-- lib/orange-core/middleware/four_oh_four.rb
-- lib/orange-core/middleware/globals.rb
-- lib/orange-core/middleware/loader.rb
-- lib/orange-core/middleware/rerouter.rb
-- lib/orange-core/middleware/restful_router.rb
-- lib/orange-core/middleware/route_context.rb
-- lib/orange-core/middleware/route_site.rb
-- lib/orange-core/middleware/show_exceptions.rb
-- lib/orange-core/middleware/static.rb
-- lib/orange-core/middleware/static_file.rb
-- lib/orange-core/middleware/template.rb
-- lib/orange-core/packet.rb
-- lib/orange-core/plugin.rb
-- lib/orange-core/resource.rb
-- lib/orange-core/resources/mapper.rb
-- lib/orange-core/resources/model_resource.rb
-- lib/orange-core/resources/not_found.rb
-- lib/orange-core/resources/page_parts.rb
-- lib/orange-core/resources/parser.rb
-- lib/orange-core/resources/routable_resource.rb
-- lib/orange-core/resources/scaffold.rb
-- lib/orange-core/stack.rb
-- lib/orange-core/templates/exceptions.haml
-- lib/orange-core/views/default_resource/create.haml
-- lib/orange-core/views/default_resource/edit.haml
-- lib/orange-core/views/default_resource/list.haml
-- lib/orange-core/views/default_resource/show.haml
-- lib/orange-core/views/default_resource/table_row.haml
-- lib/orange-core/views/not_found/404.haml
-- lib/orange-more.rb
-- lib/orange-more/administration.rb
-- lib/orange-more/administration/assets/css/admin.css
-- lib/orange-more/administration/assets/css/blueprint-ie.css
-- 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/cartons/site.rb
-- lib/orange-more/administration/cartons/site_carton.rb
-- lib/orange-more/administration/cartons/user.rb
-- lib/orange-more/administration/middleware/access_control.rb
-- lib/orange-more/administration/middleware/site_load.rb
-- lib/orange-more/administration/plugin.rb
-- lib/orange-more/administration/resources/admin_resource.rb
-- lib/orange-more/administration/resources/site_resource.rb
-- lib/orange-more/administration/resources/user_resource.rb
-- lib/orange-more/administration/templates/admin.haml
-- lib/orange-more/administration/views/openid_login.haml
-- lib/orange-more/administration/views/users/create.haml
-- lib/orange-more/administration/views/users/edit.haml
-- lib/orange-more/adverts.rb
-- lib/orange-more/adverts/cartons/adverts_carton.rb
-- lib/orange-more/adverts/plugin.rb
-- lib/orange-more/adverts/resources/adverts_resource.rb
-- lib/orange-more/adverts/views/adverts/adverts.haml
-- lib/orange-more/analytics.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/cartons/asset_carton.rb
-- lib/orange-more/assets/plugin.rb
-- lib/orange-more/assets/resources/asset_resource.rb
-- lib/orange-more/assets/views/assets/change.haml
-- 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/cartons/blog.rb
-- lib/orange-more/blog/cartons/blog_post.rb
-- lib/orange-more/blog/plugin.rb
-- lib/orange-more/blog/resources/blog_post_resource.rb
-- lib/orange-more/blog/resources/blog_resource.rb
-- lib/orange-more/blog/views/blog/blog_archive_view.haml
-- lib/orange-more/blog/views/blog/blog_offset_list_view.haml
-- lib/orange-more/blog/views/blog/blog_post_view.haml
-- lib/orange-more/blog/views/blog/sitemap_row.haml
-- 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/plugin.rb
-- lib/orange-more/cloud/resources/cloud_resource.rb
-- lib/orange-more/contactforms.rb
-- lib/orange-more/contactforms/assets/js/jquery.validate.pack.js
-- lib/orange-more/contactforms/assets/js/lib/jquery-1.4.2.js
-- 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/cartons/contactforms_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/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/plugin.rb
-- lib/orange-more/disqus/resources/disqus_resource.rb
-- lib/orange-more/disqus/views/disqus/comment_thread.haml
-- lib/orange-more/donations.rb
-- lib/orange-more/donations/cartons/donation_carton.rb
-- lib/orange-more/donations/plugin.rb
-- lib/orange-more/donations/resources/donations_resource.rb
-- lib/orange-more/donations/views/donations/donate_form.haml
-- lib/orange-more/donations/views/donations/donate_thanks.haml
-- lib/orange-more/donations/views/donations/paypal_form.haml
-- lib/orange-more/events.rb
-- lib/orange-more/events/assets/js/events.js
-- lib/orange-more/events/cartons/orange_calendar.rb
-- lib/orange-more/events/cartons/orange_event.rb
-- lib/orange-more/events/plugin.rb
-- lib/orange-more/events/resources/calendar_resource.rb
-- lib/orange-more/events/resources/event_resource.rb
-- lib/orange-more/events/views/calendar/calendar.haml
-- lib/orange-more/events/views/events/create.haml
-- lib/orange-more/events/views/events/edit.haml
-- lib/orange-more/events/views/events/list.haml
-- lib/orange-more/events/views/events/show.haml
-- lib/orange-more/events/views/events/table_row.haml
-- lib/orange-more/members.rb
-- lib/orange-more/members/cartons/member_carton.rb
-- lib/orange-more/members/plugin.rb
-- lib/orange-more/members/resources/members_resource.rb
-- lib/orange-more/members/views/members/create.haml
-- lib/orange-more/members/views/members/edit.haml
-- lib/orange-more/members/views/members/live.show.haml
-- lib/orange-more/members/views/members/login.haml
-- lib/orange-more/members/views/members/logout.haml
-- lib/orange-more/members/views/members/profile.haml
-- lib/orange-more/members/views/members/register.haml
-- lib/orange-more/news.rb
-- lib/orange-more/news/cartons/news.rb
-- lib/orange-more/news/plugin.rb
-- lib/orange-more/news/resources/news_resource.rb
-- lib/orange-more/news/views/news/archive.haml
-- lib/orange-more/news/views/news/edit.haml
-- 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/cartons/page_carton.rb
-- lib/orange-more/pages/cartons/page_version_carton.rb
-- lib/orange-more/pages/plugin.rb
-- lib/orange-more/pages/resources/page_resource.rb
-- lib/orange-more/pages/views/pages/edit.haml
-- lib/orange-more/pages/views/pages/show.haml
-- lib/orange-more/sitemap.rb
-- lib/orange-more/sitemap/assets/img/sitemap_down.png
-- lib/orange-more/sitemap/assets/img/sitemap_down_d.png
-- lib/orange-more/sitemap/assets/img/sitemap_indent.png
-- lib/orange-more/sitemap/assets/img/sitemap_indent_d.png
-- lib/orange-more/sitemap/assets/img/sitemap_outdent.png
-- lib/orange-more/sitemap/assets/img/sitemap_outdent_d.png
-- 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/cartons/route.rb
-- lib/orange-more/sitemap/middleware/flex_router.rb
-- lib/orange-more/sitemap/plugin.rb
-- lib/orange-more/sitemap/resources/sitemap_resource.rb
-- lib/orange-more/sitemap/views/default_resource/sitemap_row.haml
-- lib/orange-more/sitemap/views/sitemap/breadcrumb.haml
-- lib/orange-more/sitemap/views/sitemap/list.haml
-- lib/orange-more/sitemap/views/sitemap/one_level.haml
-- lib/orange-more/sitemap/views/sitemap/route_actions.haml
-- lib/orange-more/sitemap/views/sitemap/sitemap_links.haml
-- 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/middleware/radius_parser.rb
-- lib/orange-more/slices/plugin.rb
-- lib/orange-more/slices/resources/radius.rb
-- lib/orange-more/slices/resources/slices.rb
-- lib/orange-more/subsites.rb
-- lib/orange-more/subsites/cartons/subsite.rb
-- lib/orange-more/subsites/middleware/subsite_load.rb
-- lib/orange-more/subsites/plugin.rb
-- lib/orange-more/subsites/resources/subsite_resource.rb
-- lib/orange-more/subsites/views/subsites/index.haml
-- lib/orange-more/testimonials.rb
-- lib/orange-more/testimonials/cartons/testimonials_carton.rb
-- lib/orange-more/testimonials/plugin.rb
-- lib/orange-more/testimonials/resources/testimonials_resource.rb
-- lib/orange-more/testimonials/views/testimonials/testimonials.haml
 - lib/orange.rb
 - README.markdown
 has_rdoc: true
@@ -303,35 +125,6 @@ signing_key:
 specification_version: 3
 summary: Middle ground between Sinatra and Rails
 test_files: 
-- 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/orange_spec.rb
+- spec/spec_helper.rb
 - spec/stats.rb

data/lib/orange-core.rb

@@ -1,8 +0,0 @@
-libdir = File.dirname(__FILE__)
-$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
-
-require File.join(libdir, 'orange-core', 'magick.rb')
-Dir.glob(File.join(libdir, 'orange-core', '*.rb')).each {|f| require f }
-Dir.glob(File.join(libdir, 'orange-core', 'cartons', '*.rb')).each {|f| require f }
-Dir.glob(File.join(libdir, 'orange-core', 'resources', '*.rb')).each {|f| require f }
-Dir.glob(File.join(libdir, 'orange-core', 'middleware', '*.rb')).each {|f| require f }

data/lib/orange-core/application.rb

@@ -1,132 +0,0 @@
-module Orange
-  # Orange::Application is the main class used for building an
-  # Orange App. Typically you will not initialize it directly,
-  # but use the app method, which returns the entire Orange
-  # stack, with all middleware and the Orange::Application as
-  # the main receiver
-  #
-  # To override the stack generated by default, you can use
-  # the self.stack method, which will be used to create a new
-  # Orange::Stack
-  class Application
-    extend ClassInheritableAttributes
-    cattr_accessor :core, :stack_block
-    # Initialize will set the core, and additionally accept any
-    # other options to be added in to the opts array
-    # @param [Orange::Core] core the orange core instance that this application will use
-    # @param [Hash] *opts the optional arguments
-    def initialize(core = false, *opts, &block)
-      @core = core || self.class.core
-      @options ||= {}
-      @options = Orange::Options.new(*opts, &block).hash.with_defaults(self.class.opts)
-      @core.application(self) # Register self into core
-      init
-    end
-    
-    # stack_init is ONLY called after the {#app} 
-    # method is called, loading a stack
-    # (just in case the middleware stack added necessary functionality, etc)
-    def stack_init
-    end
-    
-    # This method is called by initialize, subclasses should override this method
-    # for their own initialization needs.
-    # 
-    # It will usually be better to use stack_init, which gives full access to
-    # the initialized stack
-    def init
-    end
-    
-    # Set the orange core to be a new core
-    #
-    # Generally, the core should be set during initialization, rather
-    # than with this method.
-    # @param [Orange::Core] core the orange core instance
-    def set_core(core)
-      @core = core
-    end
-    
-    # The standard call as required by rack. This will 
-    # make an Orange::Packet object (if necessary) and
-    # then send it to the appropriate router for routing.
-    #
-    # If the :self_routing option is true (default) then
-    # the packet will be routed by the application if there
-    # is not already another class volunteering for that role.
-    # (Routers declare themselves in the orange 
-    # env['route.router'] to be called by the application)
-    # 
-    # 
-    def call(env)
-      packet = Orange::Packet.new(@core, env)
-      # Set up this application as router if nothing else has
-      # assumed routing responsibility (for Sinatra DSL like routing)
-      self_routing = opts[:self_routing] || true
-      if (!packet['route.router'] && self_routing)
-        packet['route.router'] = self
-      end
-      packet.route
-      packet.finish
-    end
-    
-    # Returns the core
-    # @return [Orange::Core] the core instance set for the application
-    def orange
-      @core
-    end
-    
-    # The default route method for the application. Must be overridden in subclasses.
-    # 
-    # This method will raise a RuntimeError if not overridden.
-    # The intent is for the application subclass to override this method
-    # and use it to handle packets not routed by Stack middleware.
-    def route(packet)
-      raise "default response from Orange::Application.route"
-    end
-    
-    # Used to set optional values at class level. Will be merged into the options
-    # given at initialization time
-    def self.set(key, v = true)
-      @class_opts ||= {}
-      @class_opts[key] = v
-    end
-    
-    # Gives access to class defined options. 
-    def self.opts
-      @class_opts ||= {}
-    end
-    
-    # Gives access to options for the application, both from the class and the 
-    # instance level. 
-    # @return [Hash] the options hash
-    def opts
-      @options
-    end
-    
-    # Returns an instance of Orange::Stack to be run by Rack
-    #
-    # Usually, you'll call this in the rackup file: `run MyApplication.app`
-    def self.app(c = false)
-      if c
-        self.core = c 
-      else
-        self.core ||= Orange::Core.new
-      end
-      return self.core.stack unless self.core.stack.blank?
-      if self.stack_block.instance_of?(Proc)
-        Orange::Stack.new self, self.core, &self.stack_block   # turn saved proc into a block arg
-      else
-        Orange::Stack.new self, self.core
-      end
-    end
-    
-    # Changes the stack that will be used when {#app}
-    # is called
-    # 
-    # Each call to stack overrides the previous one.
-    def self.stack(core = false, &block)
-      self.core = core if core
-      self.stack_block = Proc.new           # pulls in the block and makes it a proc
-    end
-  end
-end