rory 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e4715ee9ca93a684ebe09585ff35687f6f43538
-  data.tar.gz: 5d81ed936318f64c428dd56483277f8233530012
+  metadata.gz: 73fd578d6e35268b6a7940ef886b86e1cd03f923
+  data.tar.gz: 51731d0b123a43034399bd0c27b409dcbc898b4c
 SHA512:
-  metadata.gz: cfdb1ea2f198e736555a7ea8e9ed1123da944d11fa8a0d850d2be0b5b01dd580988caf0bd97f6adc59ffd04376043783aac551f3b2d5da35fadb4235f776688a
-  data.tar.gz: 70b9cdd2237826aaf6f078f6399dad4e0f5267f71fff0c08140f514555f7a327ffd83e72c0f27c03725f43dcde43954b086d93b00931e7ec0ee3175204a40079
+  metadata.gz: 170ee5f9d5e4d1da5dc21c733d41cc26e1d8d0e12738c3edfb66739fcac09eca554019bb116b54d608f96658dcb4d3fd01b97d33acd7d9961309a1782eeb973a
+  data.tar.gz: f02a5ae7d109c79e84cf3e28205c6a42bdf8b321520adfa9868fe8489010b8caaf513b9734b5fe06b4dcd3fd53214796141e9786a4e2e3e9e90fbaec8011fd37

data/lib/rory.rb

@@ -6,7 +6,6 @@ end
 
 require 'yaml'
 require 'sequel'
-require 'rory/hash_with_dubious_semantics'
 require 'rory/application'
 require 'rory/dispatcher'
 require 'rory/route'

data/lib/rory/controller.rb

@@ -50,7 +50,10 @@ module Rory
     end
 
     def params
-      @converted_params ||= Rory::HashWithDubiousSemantics.new(@params)
+      @converted_params ||= @params.inject({}) { |memo, (key, value)|
+        memo[key.to_sym] = memo[key.to_s] = value
+        memo
+      }
     end
 
     def route_template
@@ -112,7 +115,29 @@ module Rory
 
     def call_filter_for_action?(filter, action)
       (filter[:only].nil? || filter[:only].include?(action)) &&
-        (filter[:except].nil? || !filter[:except].include?(action))
+        (filter[:except].nil? || !filter[:except].include?(action)) &&
+        filter_conditions_pass?(filter, :if) &&
+        filter_conditions_pass?(filter, :unless)
+    end
+
+    def filter_conditions_pass?(filter, type)
+      filter_conditions = Array(filter[type])
+      filter_conditions.compact.all? { |condition|
+        result = assess_filter_condition(condition)
+        if type == :unless
+          result = !result
+        end
+        result
+      }
+    end
+
+    def assess_filter_condition(condition)
+      case condition
+      when Symbol
+        self.send(condition)
+      when Proc
+        instance_exec(&condition)
+      end
     end
 
     def get_relevant_filters(which_set, action)

data/lib/rory/version.rb

@@ -1,3 +1,3 @@
 module Rory
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/spec/fixture_app/controllers/base_filtered_controller.rb

@@ -1,5 +1,9 @@
 class BaseFilteredController < Rory::Controller
   before_action :pickle_something, :except => [:eat]
-  after_action :rub_tummy
+  after_action :rub_tummy, :if => :horses_exist?
   after_action :smile, :only => [:eat]
+
+  def horses_exist?
+    params[:horses] != 'missing'
+  end
 end

data/spec/fixture_app/controllers/filtered_controller.rb

@@ -1,7 +1,7 @@
 require_relative 'base_filtered_controller'
 
 class FilteredController < BaseFilteredController
-  before_action :make_it_tasty
+  before_action :make_it_tasty, :unless => proc { !horses_exist? }
   before_action :make_it_nutritious, :only => [:eat]
   after_action :sleep, :except => [:eat]
 

data/spec/lib/rory/controller_spec.rb

@@ -26,11 +26,12 @@ 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[: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'   )
+      expect(controller.params).to eq({
+        'violet' => 'invisibility',
+        'dash' => 'superspeed',
+        :violet => 'invisibility',
+        :dash => 'superspeed'
+      })
     end
   end
 
@@ -142,6 +143,23 @@ describe Rory::Controller do
       controller.present
     end
 
+    it "filters before and after actions on :if and :unless" do
+      @routing[:route] = Rory::Route.new('', :to => 'test#eat')
+      @request = double('Rack::Request', {
+        :params => { 'horses' => 'missing' },
+        :script_name => 'script_root'
+      })
+      controller = FilteredController.new(@request, @routing)
+      expect(controller).to receive(:make_it_tasty).never
+      expect(controller).to receive(:make_it_nutritious).ordered
+      expect(controller).to receive(:eat).ordered
+      expect(controller).to receive(:rub_tummy).never
+      expect(controller).to receive(:smile).ordered
+      expect(controller).to receive(:sleep).never
+      expect(controller).to receive(:render).ordered
+      controller.present
+    end
+
     it "just returns a response if @response exists" do
       controller = Rory::Controller.new(@request, @routing)
       controller.instance_variable_set(:@response, 'Forced response')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rory
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Ravi Gadad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -171,7 +171,6 @@ files:
 - 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.rb
 - lib/rory/renderer/context.rb
@@ -204,7 +203,6 @@ 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

data/lib/rory/hash_with_dubious_semantics.rb

@@ -1,58 +0,0 @@
-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/spec/lib/rory/hash_with_dubious_semantics_spec.rb

@@ -1,64 +0,0 @@
-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