ribbon-intercom 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3dd1e6bc419cb94651ef42356db8b7b8c6c48a6
-  data.tar.gz: 8c97e000d932acf6012513ab7339e506b0c6852a
+  metadata.gz: f19a9d7871332a1a8abfb1a9b3a376c17b7389a0
+  data.tar.gz: b946129b0caf8b2d3a2236ec58d1a177e692fc96
 SHA512:
-  metadata.gz: 7642b346c15bf955093543ebee843814cace7994bb3565b95db3e833ac13816d7b1f945abea4f8c4adcbe9e284349b7dab6f171271911e5ccf3990ccf8a2856e
-  data.tar.gz: 1bde67801438c049bf1877b2c78e8cfb44f25ca82f372370afd48ab0fbc67f7c6e87876e18d9bf1c7c810cacef2b7bb6220b021931d60392b0d74e77f56ef589
+  metadata.gz: 0cd606324dd603044b14c318fd0194b7ef571c91214931a519e9b4d3e7c8920d7d82f5220693709dc36dfa6f135967306c569d3dd317fa740f901d70688b318d
+  data.tar.gz: 3de7e4b3da0da1aa1619c91a1c8ac9676dc9509f033e5af1192b5038286829cba55a828042006ba399da81d114b77be43d8afc9d974ff66c4a17a98288cc67ab

data/lib/ribbon/intercom/service.rb

@@ -33,14 +33,20 @@ module Ribbon::Intercom
         end.merge(@_method_permissions).dup
       end
 
+      # The call method is needed here because Rails checks to see if a mounted
+      # Rack app can respond_to?(:call). Without it, the Service will not mount
+      def call(env)
+        instance.call(env)
+      end
+
       def method_missing(meth, *args, &block)
         instance.send(meth, *args, &block)
       end
 
       def _load_store
-        raise "Store name missing"   unless (store_name = @_store_name.to_s)
+        raise "Store name missing" unless (store_name = @_store_name.to_s)
 
-        store = store_name.split("_").map(&:capitalize).join + "Store"
+        store = Utils.classify(store_name) + "Store"
         Intercom::Service::ChannelStores.const_get(store).new(@_store_params)
       end
     end # Class methods
@@ -71,7 +77,8 @@ module Ribbon::Intercom
     end
 
     def method_permissions!(method_name)
-      method_permissions(method_name) or raise Errors::InvalidMethodError
+      method_permissions(method_name) or
+        _respond!(404, {}, "Method requested not found.")
     end
 
     def sufficient_permissions?(intercom_method)
@@ -80,35 +87,14 @@ module Ribbon::Intercom
     end
 
     def sufficient_permissions!(intercom_method)
-      sufficient_permissions?(intercom_method) or raise Errors::MissingPermissionsError
-    end
-
-    def process_request
-      @request = Rack::Request.new(env)
-      return _respond!(405) unless request.put?
-      return _respond!(401) unless _perform_basic_auth(request.env)
-
-      # Check permissions
-      intercom_method = env['HTTP_X_INTERCOM_METHOD'].to_sym
-      sufficient_permissions!(intercom_method)
-
-      # Execute the requested method
-      args = _decode_args(request.body.read)
-
-      [intercom_method, args]
-    rescue Errors::UnsafeValueError
-      _respond!(400, {}, "Arg types are invalid")
-    rescue Errors::MissingPermissionsError
-      _respond!(403, {"X-Intercom-Permissions-Missing" => _missing_permissions(intercom_method).to_a.join(',')}, "Permissions missing.")
-    rescue Errors::InvalidMethodError
-      _respond!(404, {}, "Method requested not found.")
-    end
-
-    def call_method(intercom_method, *args)
-      body = Utils.sanitize(send(intercom_method, *args))
-      _respond!(200, {}, body)
-    rescue Errors::UnsafeValueError
-      _respond!(500, {}, "Return value type is invalid")
+      sufficient_permissions?(intercom_method) or
+        _respond!(
+          403,
+          {
+            "X-Intercom-Permissions-Missing" => _missing_permissions(intercom_method).to_a.join(',')
+            },
+          "Permissions missing."
+        )
     end
 
     def call(env)
@@ -119,8 +105,9 @@ module Ribbon::Intercom
       @env = env
 
       response = catch(:response) {
-        intercom_method, args = process_request
-        call_method(intercom_method, *args)
+        _setup_request
+        intercom_method, args = _process_request
+        _call_method(intercom_method, *args)
       }
 
       response.finish
@@ -130,7 +117,33 @@ module Ribbon::Intercom
 
     private
 
-    def _perform_basic_auth(env)
+    def _setup_request
+      @request = Rack::Request.new(env)
+      _respond!(405) unless request.put?
+    end
+
+    def _process_request
+      _request_authenticated!
+
+      # Load the method name and args from the request
+      intercom_method = _load_method_name
+      args = _load_args
+
+      [intercom_method, args]
+    end
+
+    def _call_method(intercom_method, *args)
+      body = Utils.sanitize(send(intercom_method, *args))
+      _respond!(200, {}, body)
+    rescue Errors::UnsafeValueError
+      _respond!(500, {}, "Return value type is invalid")
+    end
+
+    def _request_authenticated!
+      _respond!(401) unless _request_authenticated?
+    end
+
+    def _request_authenticated?
       auth = Rack::Auth::Basic::Request.new(env)
 
       if auth.provided? && auth.basic?
@@ -143,6 +156,19 @@ module Ribbon::Intercom
       end
     end
 
+    def _load_method_name
+      env['HTTP_X_INTERCOM_METHOD'].to_sym.tap { |intercom_method|
+        # Check permissions
+        sufficient_permissions!(intercom_method)
+      }
+    end
+
+    def _load_args
+      _decode_args(request.body.read)
+    rescue Errors::UnsafeValueError
+      _respond!(400, {}, "Arg types are invalid")
+    end
+
     def _missing_permissions(intercom_method)
       method_permissions(intercom_method) - channel.permissions
     end

data/lib/ribbon/intercom/utils.rb

@@ -25,6 +25,10 @@ module Ribbon::Intercom
       def symbolize_keys(hash)
         hash.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
       end
+
+      def classify(str)
+        str.split("_").map(&:capitalize).join
+      end
     end # Class methods
   end # Utils
 end # Ribbon::Intercom

data/lib/ribbon/intercom/version.rb

@@ -1,5 +1,5 @@
 module Ribbon
   module Intercom
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/lib/tasks/intercom.rake

@@ -12,7 +12,7 @@ namespace :intercom do
 
   namespace :service do
     task :open_channel, [:service_name, :channel_name] => :environment do |t, args|
-      service = args[:service_name].split("_").map(&:capitalize).join
+      service = Intercom::Utils.classify(args[:service_name])
       channel_name = args[:channel_name]
 
       Intercom::const_get(service).open_channel(name: channel_name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ribbon-intercom
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Robert Honer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-04 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack