slotmachine 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2888bc896a4e6518d88c01b1fa1e9ecf39b07dd2
-  data.tar.gz: cb08aec43d4b45d705ca312b2c2a8dab1537d536
+  metadata.gz: bf639bac3299c0dec8fa7bab50b6544ee7b0a674
+  data.tar.gz: bd7560301c0078a6990c0d2ce619c20ea25a1f8f
 SHA512:
-  metadata.gz: ece189ab4344b53364c7aafa4097691c4803e83ccd2ce8cf74e967572681d235eabf25a16a17bef2a777da3997188826c5aa31889088e48d80f15a00fcba21bd
-  data.tar.gz: cde30b1568177c73af6085c74d50bc83920bd9d36248e05c17c4dd06515b53a2e147a24d9434271749c79003287d1f02b1fce5a0a72a5339957278477a54cc90
+  metadata.gz: e05e7c98c3a20c6ef4e73671afb8d150cd98a5546ec815ff920b6fd870492c22012931b9acaa092c69a04dcc6efc216af3e9e9ce51f6d88e5d217da7a45c67c5
+  data.tar.gz: 3a658580b2aaceb1972b04f6c8861282a144cbdc35676a7d238650a905f232236e1c7007d9fbb95908efb335ea6f4cb4ddb4fee9f33331b44035033b0ac24c54

data/README.md

@@ -30,11 +30,28 @@ SlotMachine::Config.path = MyEngine::Engine.root.join('app/views/slots/_*')
 ```
 
 And then in your application controller
+```ruby
+  include SlotMachine::ControllerConcern
+  helper slot_machine_helper()
+```
+
+You can also override the path there...
 ```ruby
   include SlotMachine::ControllerConcern
   helper slot_machine_helper(path: 'you_can_override_the_path_of_the_slots_here/_*')
 ```
 
+...and give it a name and have a different one in another controller
+```ruby
+  include SlotMachine::ControllerConcern
+  helper slot_machine_helper(path: 'you_can_override_the_path_of_the_slots_here/_*', name: :main)
+```
+
+Path can also be an Array
+```ruby
+  include SlotMachine::ControllerConcern
+  helper slot_machine_helper(path: ['my_path/_*','my_other_path/_*' ], name: :main)
+```
 
 ## Usage
 
@@ -113,11 +130,11 @@ With the two partials from before (modal and card) we can now do this:
 
 ```slim
 = modal title: 'foo' do |modal|
-  = card title: 'a card in a modal do
+  = card title: 'a card in a modal' do
     div And wait there is still more
 
   - modal.slot :footer
-    = card title: 'a card in a modal's foot do
+    = card title: 'a card in a modal\'s foot' do
       div My example are getting a bit far fetched
 ```
 
@@ -125,10 +142,10 @@ There is a shortener for that last one
 
 ```slim
 = modal title: 'foo' do |modal|
-  - modal.card slot: :main, title: 'a card in a modal do
+  - modal.card slot: :main, title: 'a card in a modal' do
     div And wait there is still more
 
-  - modal.card slot: :footer title: 'a card in a modal's foot do
+  - modal.card slot: :footer title: 'a card in a modal\'s foot' do
       div My example are getting a bit far fetched
 ```
 
@@ -143,7 +160,7 @@ You can also call the slot several times like thus:
 
 ## What else?
 
-You noticed all my example are with slim. But it work great with yaml or erb.
+You noticed all my examples are with slim. But it work great with yaml or erb.
 
 I also name my partials with the [BEM notation](http://getbem.com/). I find it easier to organise them by components specialy if you already use this same notation with your css.
 

data/lib/slot_machine/config.rb

@@ -1,7 +1,14 @@
 # Config where is store all informations
 module SlotMachine::Config
   def self.read_slots(custom_path = nil)
-    slots_array = Dir[custom_path || path].map do |p|
+    globs = (custom_path || path)
+    globs = [globs] unless globs.is_a?(Array)
+
+    paths_array = globs.map do |g|
+      Dir[g]
+    end.flatten
+
+    slots_array = paths_array.map do |p|
       basename = File.basename(p, File.extname(p))
       basename = basename.split('.').first
       basename.slice!(0)
@@ -25,4 +32,12 @@ module SlotMachine::Config
   def self.path
     @path || Rails.root.join('app/views/slots/_*')
   end
+
+  def self.helper_modules
+    @helper_modules ||= {}
+  end
+
+  def self.helper_modules=(val)
+    @helper_modules = val
+  end
 end

data/lib/slot_machine/controller_concern.rb

@@ -42,15 +42,15 @@ module SlotMachine::ControllerConcern
     #   include SlotMachine::ControllerConcern
     #   helper slot_machine_create_module(my_path)
     # ````
-    def slot_machine_helper(path: nil)
-      return @helper_module unless @helper_module.nil?
+    def slot_machine_helper(path: nil, name: :main)
+      return SlotMachine::Config.helper_modules[name] unless SlotMachine::Config.helper_modules[name].nil?
 
       # Read slot on the custom path
       slots = SlotMachine::Config.read_slots(path)
       method_names = slots.keys
 
       # Instantiate the new module
-      @helper_module = Module.new
+      SlotMachine::Config.helper_modules[name] = Module.new
 
       # Create a child builder class with all the methods
       builder_class = Class.new(Builder)
@@ -67,7 +67,7 @@ module SlotMachine::ControllerConcern
 
       # Add 1 method per partial in the module as well
       method_names.each do |method_name|
-        @helper_module.module_eval do
+        SlotMachine::Config.helper_modules[name].module_eval do
           # this one should be in the builder but it doesnt have the builder method
           def get_buffer(string = nil, &block)
             return string unless block
@@ -96,7 +96,7 @@ module SlotMachine::ControllerConcern
         end
       end
 
-      @helper_module
+      SlotMachine::Config.helper_modules[name]
     end
   end
 end

data/lib/slot_machine/version.rb

@@ -1,3 +1,3 @@
 module SlotMachine
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slotmachine
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Cedric Feyaerts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-19 00:00:00.000000000 Z
+date: 2019-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails