bem-on-rails 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fff2737501c065e32082282035389196d6c04ff6
-  data.tar.gz: 21b73fe7f203438ec35752ac6b39e47b51c25b6b
+  metadata.gz: db5b4a9a59a618f6262eccc08032c9d2ef7d9778
+  data.tar.gz: 3f1f5738a05779c041f1debcad85651616af34f5
 SHA512:
-  metadata.gz: 6bb146bef1547d553da012d8ae3c1376902e503bd034d4ae6e8071745b0b5ac2fa65125d2ef18fcd0af310e1e195959b58522e9e67ede62e095e58f6baa4b8d3
-  data.tar.gz: b5fcfb9413c4cff5d583f25cccfa7f48e490d55c2f8c99fc7f9cafe1a10b3fc9b6e4ce4572e3791bde0ae3d906e58f6bab4a23bd2331a3bf8aeaca89b9a40991
+  metadata.gz: f5bc8f7d40d5c28a7e7dc8f83a313526e1ee15705e91bdff65458972bdc164253aaa578451b784789caa03a8c034a3597e7b61da2242c7958c36e78b0f7b9d26
+  data.tar.gz: 1e4e04663d0d743042146ff533d1b7890cb6d82d3cf14e74a749b6762e123c0c462c583628dbff95c5660f2bbf2bf9eda05d771a77c93d667fe345b2a6faa641

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.idea

data/CHANGELOG.md

@@ -1,3 +1,10 @@
 ## v0.0.1
 
-* first release with small functionality
+* first release with small functionality
+
+## v0.0.2
+
+* rendering blocks in block
+* fix trubles with mods without value
+* add custom attributes for tags
+* add custom classes for tags

data/README.md

@@ -1,6 +1,8 @@
-# BEM On Rails
+[![Bem on Rails](http://habrastorage.org/storage3/551/97d/0c5/55197d0c503e312952195b2ae0e4c337.png)](https://github.com/verybigman/bem-on-rails)
 
-Work with BEM methodology in Rails applications. BEM On Rails is ruby copy from bem-tools. 
+# BEM on Rails
+
+Work with BEM methodology in Rails applications. BEM on Rails is ruby copy from bem-tools. 
 You can read about bem-tools [here](http://bem.info/tools/bem/) and BEM methodology [here](http://bem.info/method/).
 
 ## Installation
@@ -26,11 +28,13 @@ You should run to watch your new instruments:
     
     $ thor -T 
     
-Also generator creates initializer bem.rb with BEM constant. You can customize everythink!
+Also generator creates initializer bem.rb with BEM constant. You should restart server after install. 
+You can customize everythink!
 
 ## Usage
 
-You can create blocks, elements, modificators and groups for blocks. It's awesome! Also you can remove them and watch lists of blocks, block elements, blocks mods and etc. Try thor help for more info.
+You can create blocks, elements, modificators and groups for blocks. It's awesome! Also you can remove them and watch
+lists of blocks, block elements, blocks mods and etc. Try thor help for more info.
 
 Default blocks folder structure:
  - **blocks**
@@ -98,12 +102,27 @@ Use them like configs, for require only. This involves using Sprockets.
 
 In your view you should write this:
 ```ruby
-= b "test", mods: {color: "red"}, content: [{ elem: "icon", elemMods: {size: "small"} }]        
+= b "test", mods: [{color: "red"}], content: [{ elem: "icon", elemMods: [{size: "small"}] }]
 ```
 
 If block in group:
 ```ruby
-= b "test", group: "name", mods: {color: "red"}, content: []        
+= b "test", group: "name", mods: [{color: "red"}], content: []
+```
+
+Block with mods without value:
+```ruby
+= b "test", mods: [:super, {color: "red"}], content: []
+```
+
+Block with custom attributes for tag:
+```ruby
+= b "test", attrs: {src: "/img.png"}, content: []
+```
+
+Block with custom class for tag:
+```ruby
+= b "test", cls: "custom", content: []
 ```
 
 Syntax is look like [bemhtml](http://ru.bem.info/articles/bemhtml-reference/).
@@ -113,7 +132,7 @@ Syntax is look like [bemhtml](http://ru.bem.info/articles/bemhtml-reference/).
 Now templates exists for haml, sass, coffee and md technologies, but you will create your templates in
 lib/tasks/templates. For example, you can watch haml template:
 ```haml
-%div{ bemclass }
+%div{ bemattrs }
 	= bemcontent
 ```
 Bemclass and bemcontent is BEM helpers for rendering. 
@@ -127,14 +146,13 @@ If you want it, please watch [here](https://github.com/Vasfed/csso-rails).
 
 ## Tomorrow
 
-1. Rendering blocks in block.
-2. Custom tag for block or element.
-3. Add attrs for blocks and elements.
-4. Add custom classes for blocks and elements.
-5. Flags bem and js.
-6. Mix blocks and elements.
-7. Mods with restructure. Now you can't use mods with templates(haml, slim and etc.), but they generates.
-8. Bem exutable. Work with Thor is not convenient.
+0. Incapsulate helpers methods and isolate them from project helpers.
+1. Custom tag for block or element.
+2. Add custom classes for blocks and elements.
+3. Flags bem and js.
+4. Mix blocks and elements.
+5. Mods with restructure. Now you can't use mods with templates(haml, slim and etc.), but they generates.
+6. Bem exutable. Work with Thor is not convenient.
 
 ## Contributing
 

data/app/helpers/bemonrails/bem_render_helper.rb

@@ -11,6 +11,8 @@ module Bemonrails
 	            # Block details
 	            @block_name = name
 	            @block_mods = builder[:mods]
+                @custom_attrs = builder[:attrs]
+                @custom_class = builder[:cls]
 	            @content = builder[:content]
 	            # Render block in view  
 	            template_exists?(target) ? render(file: target) : bemempty
@@ -26,6 +28,8 @@ module Bemonrails
 	            # Element details
 	            @element_name = name
 	            @element_mods = builder[:elemMods]
+                @custom_attrs = builder[:attrs]
+                @custom_class = builder[:cls]
 	            puts @element_mods
 	            @content = builder[:content]
 	            # Render element in block
@@ -34,19 +38,20 @@ module Bemonrails
 	    end
 	    alias :e :render_element
 
-	    def render_class 
+	    def render_bemattributes
 	        if @block_name && !@element_name 
 	            classes_array = [ block(@block_name) ]
 	            # Install mods
 	            if @block_mods
-	                @block_mods.each do |mod_name, mod_value|
+	                @block_mods.each do |mod|
 	                    # Generate mods classes
-	                    if mod_value
-	                        classes_array.push block(@block_name) + mod(mod_name.to_s) + mod(mod_name.to_s, mod_value)
-	                    else
-	                        classes_array.push block(@block_name) + mod(mod_name.to_s)
-	                    end
-
+                        if mod.kind_of? Hash
+                            mod.each do |mod_name, mod_value|
+                                classes_array.push block(@block_name) + mod(mod_name.to_s) + mod(mod_name.to_s, mod_value)
+                            end
+                        else
+                            classes_array.push block(@block_name) + mod(mod.to_s)
+                        end
 	                    # TODO: Find mod with restructure .haml, .erb or etc.
 	                end 
 	            end
@@ -65,9 +70,24 @@ module Bemonrails
 	            end
 	        end
 
-	        { class: classes_array.join(" ") }    
+            bemclass = classes_array.join(" ")
+
+            # If custom class exist
+            if @custom_class
+                bemclass = [bemclass, @custom_class].join(" ")
+            end
+
+            # String for tag attributes
+	        bemattributes = { class: bemclass }
+
+            # If custom attributes exist
+            if @custom_attrs
+                bemattributes.merge! @custom_attrs
+            end
+
+            bemattributes
 	    end
-	    alias :bemclass :render_class
+	    alias :bemattrs :render_bemattributes
 
 	    def render_empty
 	        "<div class=#{ bemclass }></div>".html_safe

data/app/views/bemonrails/essences/_content.html.haml

@@ -1,7 +1,17 @@
 - if @content.kind_of?(Array)
 	- @content.each do |essence|
 		- if essence.kind_of?(Hash) && essence[:elem]
-			= e essence[:elem], { content: essence[:content], mods: essence[:elemMods] }
+			= e essence[:elem], { content: essence[:content],
+			                      mods: essence[:elemMods],
+			                      attrs: essence[:attrs],
+			                      cls: essence[:cls] }
+
+		- elsif essence.kind_of?(Hash) && essence[:block]
+			= b essence[:block], { content: essence[:content],
+			                       mods: essence[:mods],
+			                       attrs: essence[:attrs],
+			                       cls: essence[:cls] }
+
 		- else
 			= essence
 - else

data/lib/bem-on-rails/generators/install_generator.rb

@@ -22,16 +22,16 @@ module Bemonrails
       end
 
       def add_initializer
-      	template "initializer.tt", File.join(Rails.root, "config", "initializers", "bem.rb")
+      	template "config/initializer.tt.rb", File.join(Rails.root, "config", "initializers", "bem.rb")
       end
 
       def install_bem_tasks
-      	template "bem.tt", File.join(Rails.root, "lib", "tasks", "bem.thor") 
+      	template "thor/bem.tt.rb", File.join(Rails.root, "lib", "tasks", "bem.thor")
       end
 
       def add_blocks_templates
       	%w(haml.tt coffee.tt md.tt sass.tt).each do |t|
-      		template t, File.join(Rails.root, "lib", "tasks", "templates", t) 
+      		template "techs/#{t}", File.join(Rails.root, "lib", "tasks", "templates", t)
       	end
       end
 

data/lib/bem-on-rails/generators/templates/techs/haml.tt

@@ -0,0 +1,2 @@
+%div{ bemattrs }
+	= bemcontent

data/lib/bem-on-rails/version.rb

@@ -1,3 +1,3 @@
 module Bemonrails
-	VERSION = "0.0.1"
+	VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bem-on-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Anton Winogradov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-08 00:00:00.000000000 Z
+date: 2013-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,12 +86,12 @@ files:
 - lib/bem-on-rails/build/bem_names.rb
 - lib/bem-on-rails/engine.rb
 - lib/bem-on-rails/generators/install_generator.rb
-- lib/bem-on-rails/generators/templates/bem.tt
-- lib/bem-on-rails/generators/templates/coffee.tt
-- lib/bem-on-rails/generators/templates/haml.tt
-- lib/bem-on-rails/generators/templates/initializer.tt
-- lib/bem-on-rails/generators/templates/md.tt
-- lib/bem-on-rails/generators/templates/sass.tt
+- lib/bem-on-rails/generators/templates/config/initializer.tt.rb
+- lib/bem-on-rails/generators/templates/techs/coffee.tt
+- lib/bem-on-rails/generators/templates/techs/haml.tt
+- lib/bem-on-rails/generators/templates/techs/md.tt
+- lib/bem-on-rails/generators/templates/techs/sass.tt
+- lib/bem-on-rails/generators/templates/thor/bem.tt.rb
 - lib/bem-on-rails/version.rb
 homepage: https://github.com/verybigman/bem-on-rails
 licenses:
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: BEM Tools for Rails applications

data/lib/bem-on-rails/generators/templates/haml.tt

@@ -1,2 +0,0 @@
-%div{ bemclass }
-	= bemcontent