rory 0.3.18 → 0.3.19

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c01333535815f9c10a53f648622dd78dff61f5a8
+  data.tar.gz: cee26fdac986fb36670265e865375eb677cadc88
+SHA512:
+  metadata.gz: 281dc7c721202e285e41222e76203eb97073abe720672ca5882da410d1a2d4e844bf52d4c40035c19d9141d906c5edc6c2487444c507e5a7ab9708d8c7d30953
+  data.tar.gz: 1bf60e9bbb6545df467c1cd8c1454032d41e9cf37b12342dc4258618bcf67f2fa30871ba24dbebf68bf34c27e90098e74f665bb4ffaf1f473ac4ff8fe5014ef6

data/README.md

@@ -0,0 +1,40 @@
+rory
+====
+
+**A lightweight, opinionated framework with Rails-like conventions.**
+
+Introduction
+------------
+
+Rory is an [MVC](http://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93controller) framework for [Ruby](https://www.ruby-lang.org).  Its conventions are very similar to that of [Ruby on Rails](http://rubyonrails.org), but fewer.
+
+Rory was started as a self-educational project, but has evolved to the point where it is used in production environments.  Its design goals, therefore, are a moving target, but are gradually moving from "understanding the design and implementation of Rails" to "creating a lightweight, opinionated framework with Rails-like conventions."
+
+History
+-------
+
+In 2008, I was first introduced to [Ruby on Rails](http://rubyonrails.org).  I'd been an independent contract PHP developer for over 8 years, and I'd never used an MVC framework before, so I was thirsty for something different.
+
+I loved Ruby (mostly).  And Rails was great for scaffolding - getting a functional web application running quickly.  However, all its "magic" (to enable convention over configuration) made it very difficult for a newcomer to understand what was going on, and to actually learn Ruby.
+
+I griped and griped about the complexity of Rails, and about the arcane maneuvers necessary to code "outside the box," until finally I decided to take a more empathic approach, and ask the question: *Why is Rails the way it is?*
+
+I figured the best way to tackle the question was to start over from scratch.  Start with a specification for a web application, and nothing but the Rack gem.  And thus was born Rory.
+
+Contributing to rory
+--------------------
+ 
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
+* Fork the project.
+* Start a feature/bugfix branch.
+* Commit and push until you are happy with your contribution.
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+Copyright
+---------
+
+Copyright (c) 2013 Ravi Gadad. See LICENSE.txt for
+further details.
+

data/lib/rory.rb

@@ -1,7 +1,13 @@
-ENV['RORY_STAGE'] ||= ENV['RACK_ENV'] || 'development'
+if ENV['RORY_STAGE']
+  puts "\n\tDEPRECATION: use 'RORY_ENV' instead of 'RORY_STAGE'\n\n"
+  ENV['RORY_ENV'] = ENV['RORY_STAGE']
+end
+
+ENV['RACK_ENV'] || 'development'
 
 require 'yaml'
 require 'sequel'
+require 'rory/hash_with_dubious_semantics'
 require 'rory/application'
 require 'rory/dispatcher'
 require 'rory/route'

data/lib/rory/application.rb

@@ -89,7 +89,7 @@ module Rory
       )
     end
 
-    def connect_db(environment = ENV['RORY_STAGE'])
+    def connect_db(environment = ENV['RORY_ENV'])
       @db_config = load_config_data(:database)
       @db = Sequel.connect(@db_config[environment.to_s])
       @db.loggers << logger
@@ -123,7 +123,7 @@ module Rory
     def logger
       @logger ||= begin
         Dir.mkdir('log') unless File.exists?('log')
-        file = File.open(File.join('log', "#{ENV['RORY_STAGE']}.log"), 'a')
+        file = File.open(File.join('log', "#{ENV['RORY_ENV']}.log"), 'a')
         Logger.new(file)
       end
     end

data/lib/rory/controller.rb

@@ -50,10 +50,7 @@ module Rory
     end
 
     def params
-      @converted_params ||= @params.inject({}) { |memo, (key, value)|
-        memo[key.to_sym] = memo[key.to_s] = value
-        memo
-      }
+      @converted_params ||= Rory::HashWithDubiousSemantics.new(@params)
     end
 
     def route_template

data/lib/rory/hash_with_dubious_semantics.rb

@@ -0,0 +1,58 @@
+require 'delegate'
+
+module Rory
+  # ActiveSupport's HashWithIndifferentAccess put it best:
+  #
+  # "This class has dubious semantics and we only have it so that people
+  # can write params[:key] instead of params[‘key’] and they get the
+  # same value for both keys."
+  class HashWithDubiousSemantics < SimpleDelegator
+    def initialize(hash)
+      fail ArgumentError unless hash.is_a?(Hash)
+      hash_with_no_symbols = convert_hash(hash)
+      super( hash_with_no_symbols )
+    end
+
+    def [](key)
+      actual_key = convert_key(key)
+      __getobj__[actual_key]
+    end
+
+    def []=(key, value)
+      actual_key = convert_key(key)
+      new_value = convert_value(value)
+      __getobj__[actual_key] = new_value
+    end
+
+    def inspect
+      "#<#{self.class.name} @hash=#{super}>"
+    end
+
+    private
+
+    def convert_hash(hash)
+      return hash if hash.empty?
+
+      hash.each_with_object({}) do |(key, value), converted_hash|
+        new_key   = convert_key(key)
+        new_value = convert_value(value)
+
+        converted_hash[new_key] = new_value
+      end
+    end
+
+    def convert_key(key)
+      case key
+      when Symbol ; key.to_s
+      else        ; key
+      end
+    end
+
+    def convert_value(value)
+      case value
+      when Hash ; HashWithDubiousSemantics.new(convert_hash(value))
+      else      ; value
+      end
+    end
+  end
+end

data/lib/rory/version.rb

@@ -1,3 +1,3 @@
 module Rory
-  VERSION = '0.3.18'
+  VERSION = '0.3.19'
 end

data/lib/tasks/db.rake

@@ -14,7 +14,7 @@ namespace :db do
 
   desc "Drop and recreate a database"
   task :purge => :load_extensions do
-    config = RORY_APP.db_config[ENV['RORY_STAGE']]
+    config = RORY_APP.db_config[ENV['RORY_ENV']]
     drop_database_from_config(config)
     create_database_from_config(config)
   end
@@ -43,7 +43,7 @@ namespace :db do
 
     desc "Purges test database"
     task :purge => :load_extensions do
-      ENV['RORY_STAGE'] = 'test'
+      ENV['RORY_ENV'] = 'test'
       Rake::Task["db:purge"].invoke
     end
 
@@ -58,4 +58,4 @@ namespace :db do
   def create_database_from_config(config)
     RORY_APP.db << "CREATE DATABASE \"#{config['database']}\""
   end
-end
+end

data/rory.gemspec

@@ -22,9 +22,9 @@ EOF
   s.required_ruby_version     = ">= 1.8.7"
   s.required_rubygems_version = ">= 1.3.6"
 
-  s.extra_rdoc_files = ["LICENSE.txt", "README.rdoc"]
+  s.extra_rdoc_files = ["LICENSE.txt", "README.md"]
   s.files = Dir['{lib/**/*,spec/**/*}'] +
-                  %w(LICENSE.txt Rakefile README.rdoc rory.gemspec)
+                  %w(LICENSE.txt Rakefile README.md rory.gemspec)
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
 
@@ -33,7 +33,7 @@ EOF
   s.add_runtime_dependency 'thin', '~> 1.0'
 
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rspec', '~> 2'
   s.add_development_dependency 'capybara'
   s.add_development_dependency 'yard'
   s.add_development_dependency 'reek'

data/spec/fixture_app/config/routes.rb

@@ -1,11 +1,13 @@
 Fixture::Application.set_routes do
   match 'foo/:id/bar', :to => 'foo#bar', :methods => [:get, :post]
   match 'this/:path/is/:very_awesome', :to => 'awesome#rad'
-  scope :module => 'goose' do
-    match 'lumpies/:lump', :to => 'lumpies#show', :methods => [:get]
-  end
-  scope :module => 'goose/wombat' do
-    match 'rabbits/:chew', :to => 'rabbits#chew', :methods => [:get]
+  scope :method => [:get] do
+    scope :module => 'goose' do
+      match 'lumpies/:lump', :to => 'lumpies#show'
+    end
+    scope :module => 'goose/wombat' do
+      match 'rabbits/:chew', :to => 'rabbits#chew'
+    end
   end
   match '/', :to => 'root#vegetable', :methods => [:get]
   match '/', :to => 'root#no_vegetable', :methods => [:delete]

data/spec/lib/rory/controller_spec.rb

@@ -26,12 +26,11 @@ describe Rory::Controller do
   describe '#params' do
     it 'returns params from request, converted for indifferent key access' do
       controller = Rory::Controller.new(@request, @routing)
-      expect(controller.params).to eq({
-        'violet' => 'invisibility',
-        'dash' => 'superspeed',
-        :violet => 'invisibility',
-        :dash => 'superspeed'
-      })
+
+      expect( controller.params[:violet]  ) .to eq( 'invisibility' )
+      expect( controller.params['violet'] ) .to eq( 'invisibility' )
+      expect( controller.params[:dash]    ) .to eq( 'superspeed'   )
+      expect( controller.params['dash']   ) .to eq( 'superspeed'   )
     end
   end
 

data/spec/lib/rory/hash_with_dubious_semantics_spec.rb

@@ -0,0 +1,64 @@
+describe Rory::HashWithDubiousSemantics do
+  subject {
+    described_class.new(hash)
+  }
+
+  context "with a variety of keys" do
+    let(:hash) { {
+      'violet' => 'invisibility',
+      :dash => 'superspeed',
+      42 => 'meaning of life...'
+    } }
+
+    it 'allows indifferent access for a key that was originally a String' do
+      expect( subject[:violet]  ) .to eq( 'invisibility' )
+      expect( subject['violet'] ) .to eq( 'invisibility' )
+    end
+
+    it 'allows indifferent access for a key that was originally a Symbol' do
+      expect( subject[:dash]  ) .to eq( 'superspeed' )
+      expect( subject['dash'] ) .to eq( 'superspeed' )
+    end
+
+    it 'does not allow indifferent access for a key that was not a string or symbol' do
+      expect( subject[42]    ) .to eq( 'meaning of life...' )
+      expect( subject[:'42'] ) .to be( nil )
+      expect( subject['42']  ) .to be( nil )
+    end
+  end
+
+  context 'nested hashes' do
+    let(:hash) { {
+      'violet' => 'invisibility',
+      'spam' => {
+        'eggs' => 'breakfast'
+      }
+    } }
+
+    it 'allows indifferent access into sub-hashes' do
+      expect( subject[:spam][:eggs]).to eq('breakfast')
+      expect( subject['spam']['eggs']).to eq('breakfast')
+      expect( subject['spam'][:eggs]).to eq('breakfast')
+      expect( subject[:spam]['eggs']).to eq('breakfast')
+    end
+  end
+
+  context 'assignment' do
+    let(:hash) { {} }
+
+    it 'allows assignment by string and symbol' do
+      subject[:unicorns] = 'rainbows'
+      subject['vampires'] = 'sparkly'
+
+      expect(subject['unicorns']).to eq('rainbows')
+      expect(subject[:vampires]).to eq('sparkly')
+    end
+
+    it 'wraps hashes on assignment' do
+      subject[:srsly] = { 'omg' => { 'wtf' => 'bbq' } }
+
+      expect( subject[:srsly][:omg][:wtf] ).to eq( 'bbq' )
+      expect( subject['srsly']['omg']['wtf'] ).to eq( 'bbq' )
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'simplecov'
 SimpleCov.start
 
-ENV['RORY_STAGE'] = 'test'
+ENV['RORY_ENV'] = 'test'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'

metadata

@@ -1,208 +1,188 @@
 --- !ruby/object:Gem::Specification
 name: rory
 version: !ruby/object:Gem::Version
-  version: 0.3.18
-  prerelease: 
+  version: 0.3.19
 platform: ruby
 authors:
 - Ravi Gadad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: reek
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-description: ! 'An exercise: Untangle the collusion of Rails idioms
-
+description: |
+  An exercise: Untangle the collusion of Rails idioms
   from my Ruby knowledge, while trying to understand some
-
   Rails design decisions.
 
-
   See http://github.com/screamingmuse/rory for more info.
-
-'
 email:
 - ravi@screamingmuse.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
-- README.rdoc
+- README.md
 files:
+- LICENSE.txt
+- README.md
+- Rakefile
+- lib/rory.rb
 - lib/rory/application.rb
 - lib/rory/controller.rb
 - lib/rory/dispatcher.rb
+- lib/rory/hash_with_dubious_semantics.rb
 - lib/rory/path_generation.rb
-- lib/rory/renderer/context.rb
 - lib/rory/renderer.rb
+- lib/rory/renderer/context.rb
 - lib/rory/route.rb
 - lib/rory/route_mapper.rb
 - lib/rory/support.rb
 - lib/rory/tasks.rb
 - lib/rory/version.rb
-- lib/rory.rb
 - lib/tasks/db.rake
 - lib/tasks/rory.rake
+- rory.gemspec
 - spec/fixture_app/config/application.rb
 - spec/fixture_app/config/routes.rb
 - spec/fixture_app/controllers/base_filtered_controller.rb
@@ -224,6 +204,7 @@ files:
 - spec/lib/rory/application_spec.rb
 - spec/lib/rory/controller_spec.rb
 - spec/lib/rory/dispatcher_spec.rb
+- spec/lib/rory/hash_with_dubious_semantics_spec.rb
 - spec/lib/rory/renderer/context_spec.rb
 - spec/lib/rory/renderer_spec.rb
 - spec/lib/rory/route_spec.rb
@@ -232,34 +213,29 @@ files:
 - spec/requests/controller_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples/path_generation.rb
-- LICENSE.txt
-- Rakefile
-- README.rdoc
-- rory.gemspec
 homepage: http://github.com/screamingmuse/rory
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Another Ruby web framework. Just what the world needs.
 test_files: []
 has_rdoc: 

data/README.rdoc

@@ -1,19 +0,0 @@
-= rory
-
-The Little Framework That Could, but why?
-
-== Contributing to rory
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
-* Fork the project.
-* Start a feature/bugfix branch.
-* Commit and push until you are happy with your contribution.
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-== Copyright
-
-Copyright (c) 2013 Ravi Gadad. See LICENSE.txt for
-further details.
-