iron_hide 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43f6efb8400709edf09c958d29466af574d7bbeb
-  data.tar.gz: 122df1373619876ef2cd2c5e1d7c109839b59373
+  metadata.gz: 0a326eeca3af2614b0635b9528484b4d5100bd24
+  data.tar.gz: bd4d3a1b41405a646b1ab4b32d02d4a1de2a0b12
 SHA512:
-  metadata.gz: 50020dee2524090274d7191e43bfb24a4271e8da4dfa6ddb4a73df560badfc4fc42f1090536171d9221ff352d0d72694cf3fda2a29b5b60249b0c68badc23574
-  data.tar.gz: 03112c2cee64e74ed11962aa6fcc2308b13686654726c617978df4700478c7bd15dc2cd67a907e2504afb11531be4dbae036582608880dac31fea47829c8ff26
+  metadata.gz: 18b5b3bec2a8ba8dbe751466559cb74b693546fa1eb7b85d9877c5378e966e2cf73be8f795d76f9548d70c6fd29de69d93c77cfb58280ab9a68e68c813420753
+  data.tar.gz: d1275f59f86dc7d2ca4e0f6626908d8617c43089c30eb30b0bba987048adbcfaadd69c50fbfffde9438edfb314f318e7d48f1b7b3bc6ebb5c139159e21a2d9d9

data/lib/iron_hide.rb

@@ -1,86 +1,51 @@
 module IronHide
-  # @raise [IronHide::AuthorizationError] if authorization fails
-  # @return [true] if authorization succeeds
-  #
-  def self.authorize!(user, action, resource)
-    unless can?(user, action, resource)
-      raise AuthorizationError
+  class << self
+
+    # @raise [IronHide::AuthorizationError] if authorization fails
+    # @return [true] if authorization succeeds
+    #
+    def authorize!(user, action, resource)
+      unless can?(user, action, resource)
+        raise AuthorizationError
+      end
+      true
     end
-    true
-  end
-
-  # @return [Boolean]
-  # @param user [Object]
-  # @param action [Symbol, String]
-  # @param resource [Object]
-  # @see IronHide::Rule::allow?
-  #
-  def self.can?(user, action, resource)
-    Rule.allow?(user, action.to_s, resource)
-  end
-
-  # Specify where to load rules from. This is specified in a config file
-  # @param type [:file] Specify the adapter type. Only json is supported
-  # for now
-  def self.adapter=(type)
-    @adapter_type = type
-  end
-
-  def self.adapter
-    @adapter_type
-  end
 
-  # Set the top-level namespace for the application's Rules
-  #
-  # @param val [String]
-  # @example
-  #   'com::myCompany::myProject'
-  def self.namespace=(val)
-    @namespace = val
-  end
+    # @return [Boolean]
+    # @param user [Object]
+    # @param action [Symbol, String]
+    # @param resource [Object]
+    # @see IronHide::Rule::allow?
+    #
+    def can?(user, action, resource)
+      Rule.allow?(user, action.to_s, resource)
+    end
 
-  # Default namespace is com::IronHide
-  #
-  # @return [String]
-  def self.namespace
-    @namespace || 'com::IronHide'
-  end
+    # @return [IronHide::Storage]
+    def storage
+      @storage ||= IronHide::Storage.new(configuration.adapter)
+    end
 
-  # Specify the file path for the JSON flat-file for rules
-  # Only applicable if using the JSON adapter
-  # @param files [String, Array<String>]
-  #
-  def self.json=(*files)
-    @json_files = files
-  end
+    attr_reader :configuration
 
-  # @return [Array<String>]
-  def self.json
-    @json_files
-  end
+    # @yield [IronHide::Configuration]
+    def config
+      yield configuration
+    end
 
-  # @return [IronHide::Storage]
-  def self.storage
-    @storage ||= begin
-      if @adapter_type.nil?
-        raise IronHideError, "Storage adapter not defined"
-      end
-      IronHide::Storage.new(@adapter_type)
+    def configuration
+      @configuration ||= IronHide::Configuration.new
     end
-  end
 
-  # Allow the module to be configurable from a config file
-  # See: {file:README.md}
-  # @yield [IronHide]
-  def self.config
-    yield self
-  end
+    alias_method :configure, :config
 
-  # Resets internal state
-  #
-  # @return [void]
-  def self.reset
-    instance_variables.each { |i| instance_variable_set(i,nil) }
+    # Resets storage
+    # Useful primarily for testing
+    #
+    # @return [void]
+    def reset
+      @storage = nil
+    end
   end
 end
 
@@ -89,3 +54,4 @@ require 'iron_hide/errors'
 require 'iron_hide/rule'
 require 'iron_hide/condition'
 require 'iron_hide/storage'
+require 'iron_hide/configuration'

data/lib/iron_hide/configuration.rb

@@ -0,0 +1,30 @@
+module IronHide
+  class Configuration
+
+    attr_accessor :adapter, :namespace, :json
+
+    def initialize
+      @adapter   = :file
+      @namespace = 'com::IronHide'
+    end
+
+    # Extend configuration variables
+    #
+    # @param config_hash [Hash]
+    #
+    # @example
+    #   IronHide.configuration.add_configuration(couchdb_server: 'http://127.0.0.1:5984')
+    #   IronHide.configuration.couchdb_server)
+    #   #=> 'http://127.0.0.1:5984'
+    #
+    #   IronHide.configuration.couchdb_server = 'other'
+    #   #=> 'other'
+    #
+    def add_configuration(config_hash)
+      config_hash.each do |key, val|
+        instance_eval { instance_variable_set("@#{key}",val) }
+        self.class.instance_eval { attr_accessor key }
+      end
+    end
+  end
+end

data/lib/iron_hide/rule.rb

@@ -20,7 +20,7 @@ module IronHide
     # @param resource [Object]
     # @return [Array<IronHide::Rule>]
     def self.find(user, action, resource)
-      ns_resource = "#{IronHide.namespace}::#{resource.class.name}"
+      ns_resource = "#{IronHide.configuration.namespace}::#{resource.class.name}"
       storage.where(resource: ns_resource, action: action).map do |json|
         new(user, resource, json)
       end

data/lib/iron_hide/storage.rb

@@ -1,5 +1,4 @@
 # IronHide::Storage provides a common interface regardless of storage type
-# by implementing the Adapter pattern to decouple _how_ JSON
 #
 require 'multi_json'
 
@@ -22,16 +21,7 @@ module IronHide
       adapter.where(opts)
     end
   end
-
-  # @abstract Subclass and override {#where} to implement an Adapter class
-  class AbstractAdapter
-
-    # @option opts [String] :resource *required*
-    # @option opts [String] :action *required*
-    def where(opts = {})
-      raise NotImplementedError
-    end
-  end
 end
 
+
 require 'iron_hide/storage/file_adapter'

data/lib/iron_hide/storage/file_adapter.rb

@@ -1,14 +1,12 @@
 module IronHide
   class Storage
     # @api private
-    class FileAdapter < AbstractAdapter
+    class FileAdapter
       attr_reader :rules
 
       def initialize
-        json = IronHide.json.each_with_object([]) do |files, ary|
-          Array(files).map do |file|
-            ary.concat(MultiJson.load(File.open(file).read, minify: true))
-          end
+        json = Array(IronHide.configuration.json).each_with_object([]) do |file, ary|
+          ary.concat(MultiJson.load(File.open(file).read, minify: true))
         end
         @rules = unfold(json)
       rescue MultiJson::ParseError => e

data/lib/iron_hide/version.rb

@@ -1,6 +1,6 @@
 module IronHide
   MAJOR = "0"
-  MINOR = "2"
+  MINOR = "3"
   BUILD = "1"
   VERSION = [MAJOR, MINOR, BUILD].join(".")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iron_hide
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Alan Cohen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-05 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -117,6 +117,7 @@ extra_rdoc_files: []
 files:
 - lib/iron_hide.rb
 - lib/iron_hide/condition.rb
+- lib/iron_hide/configuration.rb
 - lib/iron_hide/errors.rb
 - lib/iron_hide/rule.rb
 - lib/iron_hide/storage.rb
@@ -142,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Describe your authorization rules with JSON