orange 0.0.13 → 0.0.14

data/spec/{orange → orange-core}/spec_helper.rb

@@ -1,8 +1,8 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
+require 'orange-core'
 require 'rubygems'
-require 'orange'
 
 require 'mock/mock_app'
 require 'mock/mock_pulp'

data/spec/{orange → orange-core}/stack_spec.rb

@@ -163,26 +163,26 @@ describe Orange::Stack do
     x.middlewarez.should have(1).middlewares
   end
     
-  it "should not include Rack::OpenID unless openid_access_control enabled" do
-    defined?(Rack::OpenID).should be_nil
-    x= Orange::Stack.new do
-      openid_access_control
-      run MockExitware.new
-    end
-    defined?(Rack::OpenID).should == "constant"
-  end
-  
-  it "should add middleware when calling openid_access_control" do
-    x= Orange::Stack.new do
-      no_recapture
-      run MockExitware.new
-    end
-    x.middlewarez.should have(1).middlewares
-    x.openid_access_control
-    x.middlewarez.should have(3).middlewares
-    x.middlewarez.select{|y| y.instance_of?(Rack::OpenID)}.should_not be_empty
-    x.middlewarez.select{|y| y.instance_of?(Orange::Middleware::AccessControl)}.should_not be_empty
-  end
+  # it "should not include Rack::OpenID unless openid_access_control enabled" do
+  #     defined?(Rack::OpenID).should be_nil
+  #     x= Orange::Stack.new do
+  #       openid_access_control
+  #       run MockExitware.new
+  #     end
+  #     defined?(Rack::OpenID).should == "constant"
+  #   end
+  
+  # it "should add middleware when calling openid_access_control" do
+  #     x= Orange::Stack.new do
+  #       no_recapture
+  #       run MockExitware.new
+  #     end
+  #     x.middlewarez.should have(1).middlewares
+  #     x.openid_access_control
+  #     x.middlewarez.should have(3).middlewares
+  #     x.middlewarez.select{|y| y.instance_of?(Rack::OpenID)}.should_not be_empty
+  #     x.middlewarez.select{|y| y.instance_of?(Orange::Middleware::AccessControl)}.should_not be_empty
+  #   end
   
   it "should include a module into Orange::Packet on add_pulp" do
     x= Orange::Stack.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: orange
 version: !ruby/object:Gem::Version 
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors: 
 - David Haslem
@@ -9,29 +9,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-19 00:00:00 -05:00
+date: 2010-02-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.10.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: dm-more
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.10.2
-    version: 
 - !ruby/object:Gem::Dependency 
   name: rack
   type: :runtime
@@ -52,56 +32,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.2.13
     version: 
-- !ruby/object:Gem::Dependency 
-  name: rack-abstract-format
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.9
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rack-openid
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.2.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: openid_dm_store
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.1.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: dm-is-awesome_set
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.11.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: radius
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.6.1
-    version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   type: :development
@@ -131,81 +61,96 @@ 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/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/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/create.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/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/sitemap/list.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.rb
-- lib/orange/application.rb
-- lib/orange/assets/css/admin.css
-- lib/orange/assets/css/blueprint-ie.css
-- lib/orange/assets/css/blueprint-print.css
-- lib/orange/assets/css/blueprint.css
-- lib/orange/assets/css/exceptions.css
-- lib/orange/assets/img/sitemap_down.png
-- lib/orange/assets/img/sitemap_down_d.png
-- lib/orange/assets/img/sitemap_indent.png
-- lib/orange/assets/img/sitemap_indent_d.png
-- lib/orange/assets/img/sitemap_outdent.png
-- lib/orange/assets/img/sitemap_outdent_d.png
-- lib/orange/assets/img/sitemap_up.png
-- lib/orange/assets/img/sitemap_up_d.png
-- lib/orange/assets/js/exceptions.js
-- lib/orange/assets/js/jquery.js
-- lib/orange/assets/js/sitemap.js
-- lib/orange/carton.rb
-- lib/orange/cartons/asset_carton.rb
-- lib/orange/cartons/page_carton.rb
-- lib/orange/cartons/page_version_carton.rb
-- lib/orange/cartons/site_carton.rb
-- lib/orange/cartons/user_carton.rb
-- lib/orange/core.rb
-- lib/orange/magick.rb
-- lib/orange/middleware/access_control.rb
-- lib/orange/middleware/base.rb
-- lib/orange/middleware/database.rb
-- lib/orange/middleware/flex_router.rb
-- lib/orange/middleware/four_oh_four.rb
-- lib/orange/middleware/globals.rb
-- lib/orange/middleware/loader.rb
-- lib/orange/middleware/radius_parser.rb
-- lib/orange/middleware/rerouter.rb
-- lib/orange/middleware/restful_router.rb
-- lib/orange/middleware/route_context.rb
-- lib/orange/middleware/route_site.rb
-- lib/orange/middleware/show_exceptions.rb
-- lib/orange/middleware/site_load.rb
-- lib/orange/middleware/static.rb
-- lib/orange/middleware/static_file.rb
-- lib/orange/middleware/template.rb
-- lib/orange/packet.rb
-- lib/orange/resource.rb
-- lib/orange/resources/admin_resource.rb
-- lib/orange/resources/asset_resource.rb
-- lib/orange/resources/mapper.rb
-- lib/orange/resources/model_resource.rb
-- lib/orange/resources/not_found.rb
-- lib/orange/resources/page_parts.rb
-- lib/orange/resources/page_resource.rb
-- lib/orange/resources/parser.rb
-- lib/orange/resources/radius.rb
-- lib/orange/resources/routable_resource.rb
-- lib/orange/resources/singleton_model_resource.rb
-- lib/orange/resources/sitemap_resource.rb
-- lib/orange/resources/slices.rb
-- lib/orange/resources/user_resource.rb
-- lib/orange/stack.rb
-- lib/orange/templates/admin.haml
-- lib/orange/templates/exceptions.haml
-- lib/orange/views/assets/create.haml
-- lib/orange/views/default_resource/create.haml
-- lib/orange/views/default_resource/edit.haml
-- lib/orange/views/default_resource/list.haml
-- lib/orange/views/default_resource/show.haml
-- lib/orange/views/default_resource/table_row.haml
-- lib/orange/views/not_found/404.haml
-- lib/orange/views/openid_login.haml
-- lib/orange/views/pages/edit.haml
-- lib/orange/views/sitemap/list.haml
-- lib/orange/views/sitemap/sitemap_links.haml
-- lib/orange/views/sitemap/table_row.haml
-- lib/orange/views/sitemap/two_level.haml
 - README.markdown
 has_rdoc: true
 homepage: http://github.com/therabidbanana/orange
@@ -236,42 +181,35 @@ signing_key:
 specification_version: 3
 summary: Middle ground between Sinatra and Rails
 test_files: 
-- spec/orange/application_spec.rb
-- spec/orange/carton_spec.rb
-- spec/orange/core_spec.rb
-- spec/orange/magick_spec.rb
-- spec/orange/middleware/access_control_spec.rb
-- spec/orange/middleware/base_spec.rb
-- spec/orange/middleware/database_spec.rb
-- spec/orange/middleware/globals_spec.rb
-- spec/orange/middleware/rerouter_spec.rb
-- spec/orange/middleware/restful_router_spec.rb
-- spec/orange/middleware/route_context_spec.rb
-- spec/orange/middleware/route_site_spec.rb
-- spec/orange/middleware/show_exceptions_spec.rb
-- spec/orange/middleware/site_load_spec.rb
-- spec/orange/middleware/static_file_spec.rb
-- spec/orange/middleware/static_spec.rb
-- spec/orange/middleware/template_spec.rb
-- spec/orange/mock/mock_app.rb
-- spec/orange/mock/mock_carton.rb
-- spec/orange/mock/mock_core.rb
-- spec/orange/mock/mock_middleware.rb
-- spec/orange/mock/mock_mixins.rb
-- spec/orange/mock/mock_model_resource.rb
-- spec/orange/mock/mock_pulp.rb
-- spec/orange/mock/mock_resource.rb
-- spec/orange/mock/mock_router.rb
-- spec/orange/orange_spec.rb
-- spec/orange/packet_spec.rb
-- spec/orange/resource_spec.rb
-- spec/orange/resources/admin_resource_spec.rb
-- spec/orange/resources/mapper_spec.rb
-- spec/orange/resources/model_resource_spec.rb
-- spec/orange/resources/parser_spec.rb
-- spec/orange/resources/routable_resource_spec.rb
-- spec/orange/resources/singleton_model_resource_spec.rb
-- spec/orange/resources/sitemap_resource_spec.rb
-- spec/orange/spec_helper.rb
-- spec/orange/stack_spec.rb
+- 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

data/lib/orange/middleware/rerouter.rb

@@ -1,13 +0,0 @@
-require 'orange/middleware/base'
-module Orange::Middleware
-  
-  class Rerouter < Base
-    def packet_call(packet)
-      begin
-        pass packet
-      rescue Orange::Reroute
-        packet.finish
-      end
-    end
-  end
-end

data/lib/orange/resources/singleton_model_resource.rb

@@ -1,7 +0,0 @@
-module Orange
-  # Singleton Model Resource acts similar to model resource, but doesn't have
-  # a list view, and instead only shows a single object
-  class SingletonModelResource < ModelResource
-    
-  end
-end

data/spec/orange/middleware/access_control_spec.rb

@@ -1,3 +0,0 @@
-describe Orange::Middleware::AccessControl do
-  it "should be spec'ed"
-end

data/spec/orange/middleware/database_spec.rb

@@ -1,3 +0,0 @@
-describe Orange::Middleware::Database do
-  it "should be spec'ed"
-end

data/spec/orange/middleware/site_load_spec.rb

@@ -1,26 +0,0 @@
-describe Orange::Middleware::SiteLoad do
-  it "should load Orange::SiteResource when used in stack" do
-    c = Orange::Core.new
-    c.should_receive(:load).with(an_instance_of(Orange::SiteResource), an_instance_of(Symbol))
-    app = Orange::Middleware::SiteLoad.new(nil, c)
-    
-  end
-  
-  it "should load the site object into the packet, if available" do
-    Orange::Site.should_receive(:first).with(an_instance_of(Hash)).and_return('foo')
-    app = Orange::Middleware::SiteLoad.new(return_env_app, Orange::Core.new)
-    ret = app.call({})
-    ret[0]['orange.env'].should have_key('site')
-    ret[0]['orange.env']['site'].should == 'foo'
-  end
-  
-  it "should create a new site object, if one doesn't exist" do
-    Orange::Site.should_receive(:first).with(an_instance_of(Hash)).and_return(false)
-    m = mock("site")
-    Orange::Site.should_receive(:new).with(an_instance_of(Hash)).and_return(m)
-    m.should_receive(:save).and_return(true)
-    app = Orange::Middleware::SiteLoad.new(return_env_app, Orange::Core.new)
-    ret = app.call({})
-    ret[0]['orange.env'].should have_key('site')
-  end
-end

data/spec/orange/middleware/template_spec.rb

@@ -1,3 +0,0 @@
-describe Orange::Middleware::Template do
-  it "should be spec'ed"
-end

data/spec/orange/resources/admin_resource_spec.rb

@@ -1,16 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-describe Orange::AdminResource do
-  before(:all) do
-  end
-  it "should have a function for returning list of links" do
-    a = Orange::AdminResource.new
-    a.set_orange(Orange::Core.new, :admin)
-    a.links(empty_packet)
-  end
-  it "should be have an add_link function" do
-    a = Orange::AdminResource.new
-    a.set_orange(Orange::Core.new, :admin)
-    a.add_link('Content', {})
-  end
-end

data/spec/orange/resources/singleton_model_resource_spec.rb

@@ -1,4 +0,0 @@
-describe Orange::SingletonModelResource do
-  
-  it "should be spec'ed" 
-end

data/spec/orange/resources/sitemap_resource_spec.rb

@@ -1,5 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-describe Orange::SitemapResource do
-  it "should be spec'ed" 
-end