bem-on-rails 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f66d7fdd5df85cb015296b66ec95448402ff0f1
-  data.tar.gz: 1f2395fd3b5d51a031e66a4c0c7c2cbaf7462b91
+  metadata.gz: 528efc9c4ee0620d95e5923c59b8ab349d27cf3f
+  data.tar.gz: 094484ca8182ccb9d9e519a65a6868a093e804cb
 SHA512:
-  metadata.gz: 69bafa47042962c169f8f2ac8c53bb4652736ff6bb7c113a2921575931a37bad1dfc331a3129954f6f924194a42d42cc07ecee3fe3ee0c8c218d344002d80df0
-  data.tar.gz: 08f97d4c7e17769d5a5423356b63c80ac6f8833c7f40f0c5c96bb0bef7885faf705bc62b7a373ea7abadef452622d87adafc897535a371b0680c8863ecaac022
+  metadata.gz: aefa6d3c4ce10fa5823245a77db22ca88d48d5a5bf2b91b105ad7c8bb575b569cd235c563e54f1266a71f9be63e0b4f7168d2a32560bb3050ea956efff92b2d9
+  data.tar.gz: 365656e97e01dd2654133f1fc68efde5a21e8fdf4328309a63605b3ed27277ed7595903b14f9e5fe050905288fe559390e68e329bd17ecf5121ba820a5df783c

data/CHANGELOG.md

@@ -20,3 +20,8 @@
 * more refactoring
 * add mix functionality
 * walking to clean code
+
+## v0.0.5
+
+* work with levels
+* errors fixes

data/README.md

@@ -26,6 +26,10 @@ Then you should run install generator:
 This generator creates Thor task with templates. You should run to watch your new instruments:
     
     $ thor -T 
+
+If you want use default level, you must be create folders tree for it:
+
+    $ thor bem:levels -a --default
     
 You should restart server after install. 
 You can customize everythink in initializers/bem.rb!
@@ -35,36 +39,52 @@ You can customize everythink in initializers/bem.rb!
 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**
-   - **block_name**
-     - **elements**
-       - **__element_name**
-         - __element_name.html.haml
-         - __element_name.css.sass
-         - __element_name.coffee
-         - __element_name.md
-     - **mods**
-       - **_mod_name**
-         - **_mod_value**
-         - _mod_name.css.sass
-         - _mod_name.coffee
-         - _mod_name.md
-     - block_name.html.haml
-     - block_name.css.sass
-     - block_name.coffee
-     - block_name.md
-   - **group_name**
-     - **block_name**
+
+- **bem**
+    - **level_name**
+        - **block_name**
+            - **elements**
+                - **__element_name**
+                    - __element_name.html.haml
+                    - __element_name.css.sass
+                    - __element_name.coffee
+                    - __element_name.md
+            - **mods**
+                - **_mod_name**
+                    - **_mod_value**
+                    - _mod_name.css.sass
+                    - _mod_name.coffee
+                    - _mod_name.md
+            - block_name.html.haml
+            - block_name.css.sass
+            - block_name.coffee
+            - block_name.md
 
 You can specify all prefixes for blocks, elements and mods in bem.rb initializer.
 
+**All blocks now creates on levels.**
+
+### Levels
+
+Create new level:
+
+    $ thor bem:levels -a -n level_name
+    
+Get from git:
+
+    $ thor bem:levels -a -g git@github.com:verybigman/bem-controls.git
+    
+Copy from directory:
+
+    $ thor bem:levels -a -d ~/path/to/level_name
+
 ### Creating
 
 Easy block creating look like:
 
     $ thor bem:create -b test
     
-Block with modificator:
+Block with mod:
 
     $ thor bem:create -b test -m large
 
@@ -87,14 +107,12 @@ Element with pretty mod:
 Block in special technolody:
     $ thor bem:create -b test -T sass
 
-Element in special tehcnology creates like block. List of know technologies you can see in bem.rb
-initializer. You can customize it. After block, element or mod creating generator 
-adds to assets main file (application) require string. Ex:
+Element in special tehcnology creates like block. List of know technologies you can see in bem.rb initializer. You can customize it. After block, element or mod creating generator adds to level assets (level_name/.bem/assets) main file (level) require string. Ex:
 ```sass
-//= require test/elements/__field/__field.css.sass
+//= require ../../../../test/elements/__field/__field.css.sass
 ```
-You should remember! You are not in any case should not be writing styles and scripts in assets application files.
-Use them like configs, for require only. This involves using Sprockets.
+You should remember! You are not in any case should not be writing styles and scripts in assets levels and application files.
+Use them like configuration files, for require only. This involves using Sprockets.
 
 ### Rendering
 
@@ -136,12 +154,12 @@ Now templates exists for haml, sass, coffee and md technologies, but you will cr
 lib/tasks/templates. For example, you can watch haml template:
 ```haml
 - haml_tag this[:tag], this[:attrs]
-	= content
+    = content
 ```
 Or Slim template:
 ```slim
 * this[:tag], this[:attrs]
-	= content
+    = content
 ```
 This and content is BEM helpers for rendering. For access to default essence propeties use 'this' method.
 For access to custom essence properties use 'ctx' method.
@@ -158,11 +176,9 @@ If you want it, please watch [here](https://github.com/Vasfed/csso-rails).
 ## Tomorrow
 
 0. Incapsulate helpers methods and isolate them from project helpers.
-1. Flag bem.
-2. i-bem.js for html.
-3. deps.js
-4. Mods with restructure. Now you can't use mods with templates(haml, slim and etc.), but they generates.
-5. Bem exutable. Work with Thor is not convenient.
+1. i-bem.js for html.
+2. deps.js
+3. Mods with restructure. Now you can't use mods with templates(haml, slim and etc.), but they generates.
 
 ## Contributing
 

data/ToDo.md

@@ -0,0 +1,7 @@
+1. Removing levels.
+2. Update removing assets lines with Thor:Actions (gsub).
+3. Creating essences on levels.
+4. Levels autoordering. Now we write it by hands in initializers/bem.rb.
+5. Manipulate with essence from parent level in template.
+6. Right work for Slim. Now it's trouble.
+7. See here [Stux](https://github.com/inossidabile/styx) for bridge js params from blocks to javascript code.

data/app/helpers/bemonrails/bem_render_helper.rb

@@ -4,7 +4,7 @@ module Bemonrails
 
     def b(name, builder={})
       unless name.blank?
-        path = File.join BEM[:blocks][:dir], build_path_for(:block, builder)
+        path = File.join build_path_for(:block, builder, false)
         target = File.join path, block(name), block(name)
         get_bemattributes_from builder
         set_names :block, name
@@ -15,7 +15,7 @@ module Bemonrails
 
     def e(name, builder={})
       unless name.blank?
-        path = File.join build_path_for(:element, builder)
+        path = File.join build_path_for(:element, builder, false)
         target = File.join path, element(name), element(name)
         get_bemattributes_from builder
         set_names :element, name
@@ -33,9 +33,9 @@ module Bemonrails
         end
       end
       @this[:ctx] = builder
-      # Set defult attrs, if user not set them.
-      @this[:tag] ||= :div
+      @this[:bem] ||= true
       @this[:attrs] ||= {}
+      @this[:tag] ||= :div
     end
 
     def set_names(essence, name)
@@ -50,8 +50,12 @@ module Bemonrails
 
     def update_bemattributes
       classes_array = []
-      generate_class(@this, classes_array)
-      install_mix(@this[:mix], classes_array)
+      if @this[:bem] == true
+        generate_class(@this, classes_array)
+        install_mix(@this[:mix], classes_array)
+      else
+        classes_array.push(@this[:elem] ? @this[:elem] : @this[:block])
+      end
       @this[:attrs].merge!({class: [classes_array, @this[:cls]].join(" ").strip!})
     end
 

data/lib/bem-on-rails/build/bem_names.rb

@@ -1,9 +1,9 @@
 module Bemonrails
   module BemNames
     # Directories paths.
-    def build_path_for(essence, builder=options)
-      # I think all block can be in groups
-      path = [builder[:group]]
+    def build_path_for(essence, builder=options, include_level=true)
+      current_level = builder[:level] ? builder[:level] : BEM[:level]
+      path = include_level ? [current_level] : []
       case essence
       when :mod
         # This is for mods with value
@@ -29,8 +29,8 @@ module Bemonrails
       File.join(path.compact)
     end
 
-    def path_to_block(path)
-      BEM[:blocks][:path] + path
+    def path_to_block(path, level="")
+      File.join Rails.root.join(BEM[:root], level + path)
     end
 
     def generate_names(builder=options)
@@ -51,7 +51,7 @@ module Bemonrails
         end
       end
 
-      # Generate names for elements, his mods and they values
+      # Generate names for elements, they mods and they values
       if builder[:element]
 
         names[:name] = element
@@ -86,7 +86,7 @@ module Bemonrails
     end
 
     def element_directory
-      block_name = @this[:block] ? @this[:block] : options[:block]
+      block_name = @this ? @this[:block] : options[:block]
       File.join(block(block_name), BEM[:elements][:dir])
     end
 

data/lib/bem-on-rails/build/levels.rb

@@ -0,0 +1,10 @@
+module Bemonrails
+    module Levels        
+        def parse_bem_levels
+            BEM[:levels].each do |level|
+                prepend_view_path File.join(BEM[:root] , level[:name])
+            end
+            prepend_view_path BEM[:root] 
+        end
+    end
+end

data/lib/bem-on-rails/generators/templates/config/initializer.tt.rb

@@ -2,18 +2,17 @@
 # BEM[:techs][:my_tech] = ".ext"
 
 # List of default techs, generating if -T is empty.
-# BEM[:default] << :my_tech
+# BEM[:default].push(:my_tech)
 
 # Usage files variants. File for Readme about essences.
-# BEM[:usage] << :my_tech
+# BEM[:usage].push(:my_tech)
 
 # Default directories, try to customize.
 # Blocks directory in root of rails app.
 # BEM[:blocks] = {
-#   dir: "blocks",
-#   path: Rails.root.join("blocks"),
-#   prefix: "",
-#   postfix: ""
+#  dir: BEM[:root],
+#  prefix: "",
+#  postfix: ""
 # }
 # Elements and mods directory in every block. Configure it's like blocks.
 # Write 'dir: ""' for creating elements in root of block.
@@ -24,6 +23,17 @@
 #   ...
 # }
 
+# Work with levels
+# Add new level with 'thor bem:levels'
+# Require it: 
+# bem_controls = { name: "bem-controls", 
+#                  git:  "git@github.com:verybigman/bem-controls.git" }
+# Push to levels stack:
+# BEM[:levels].push(bem_controls)
+# Set it default if you want:
+# BEM[:level] = bem_controls[:name]
+# After install default level is your app name. Take it by BEM[:app].
+
 # [!] If you work with sass and you want to create blocks, elements and mods in sass,
 # you should convert 'application.css' to 'application.css.sass'. Because, when
 # blocks, elements or mods creates, technology files will be included to application

data/lib/bem-on-rails/generators/templates/thor/bem.tt.rb

@@ -13,7 +13,7 @@ class Bem < Thor
     method_option :mod, type: :string, aliases: "-m", desc: "Create modificator for block or element."
     method_option :value, type: :string, aliases: "-v", desc: "Value for modificator."
     method_option :tech, type: :string, aliases: "-T", desc: "Create essence in spec tech."
-    method_option :group, type: :string, aliases: "-l", desc: "Create essence in group. Work for blocks only!"
+    method_option :level, type: :string, aliases: "-l", desc: "Create essence in level. Work for blocks only!"
     method_option :force, type: :boolean, desc: "Force existing block, element or mod files."
     def create
         path = build_path_for(essence)
@@ -27,7 +27,7 @@ class Bem < Thor
     method_option :mod, type: :string, aliases: "-m", desc: "Remove modificator for block or element."
     method_option :value, type: :string, aliases: "-v", desc: "Value for modificator."
     method_option :tech, type: :string, aliases: "-T", desc: "Remove essence in spec tech."
-    method_option :group, type: :string, aliases: "-l", desc: "Remove essence in group. Work for blocks only!"
+    method_option :level, type: :string, aliases: "-l", desc: "Remove essence in level. Work for blocks only!"
     def remove
         path = build_path_for(essence)
         manipulate_essence(:remove, essence, path)
@@ -39,18 +39,18 @@ class Bem < Thor
     method_option :element, type: :string, aliases: "-e", desc: "Element usage"
     method_option :mod, type: :string, aliases: "-m", desc: "Mod usage."
     method_option :value, type: :string, aliases: "-v", desc: "Mod value usage."
-    method_option :group, type: :string, aliases: "-l", desc: "Search essence in group."
+    method_option :level, type: :string, aliases: "-l", desc: "Search essence in level."
     def usage
         path = build_path_for(essence)
         manipulate_essence(:usage, essence, path)
     end
 
 
-    desc 'list', 'See list of group, block elements, mods and etc.'
+    desc 'list', 'See list of level, block elements, mods and etc.'
     method_option :block, type: :string, aliases: "-b", desc: "All block elements, mods and mods values"
     method_option :element, type: :string, aliases: "-e", desc: "All element mods and mods values"
     method_option :mod, type: :string, aliases: "-m", desc: "All mod values."
-    method_option :group, type: :string, aliases: "-l", desc: "All blocks in group."
+    method_option :level, type: :string, aliases: "-l", desc: "All blocks in level."
     def list
         path = essence ? build_path_for(essence) : build_path_for(:block)
         case essence
@@ -66,10 +66,85 @@ class Bem < Thor
         end
     end
 
+    desc 'levels', 'Manipulating with levels'
+    method_option :add, type: :boolean, aliases: "-a", desc: "Add new level"
+    method_option :git, type: :string, aliases: "-g", desc: "From git repository"
+    method_option :dir, type: :string, aliases: "-d", desc: "From local directory"
+    method_option :new, type: :string, aliases: "-n", desc: "Create new level"
+    method_option :default, type: :string, desc: "Create default level tree"
+    def levels
+        if options[:add]
+            level_name = ""
+            level = ""
+            if options[:git]
+                level_name = options[:git].split("/").last.gsub(".git", "")
+                level = Rails.root.join BEM[:root], level_name
+                print_message("Cloning blocks into new level: #{ level_name }...", "green")
+                `git clone #{ options[:git] } #{ level }`
+                test_level(level) ? level_added : level_error
+                level_has_assets?(level) ? update_assets_with_level(level_name) : make_level_assets_path(level)
+            elsif options[:dir]
+                level_name = options[:git].split("/").last
+                level = Rails.root.join BEM[:root], level_name
+                print_message("Copying blocks into new level: #{ level_name }...", "green")
+                `cp -R #{ options[:dir] } #{ level }`
+                test_level(level) ? level_added : level_error
+                level_has_assets?(level) ? update_assets_with_level(level_name) : make_level_assets_path(level)
+            elsif options[:new]
+                level_name = options[:new]
+                level = Rails.root.join BEM[:root], level_name
+                make_level_assets_path level
+                update_assets_with_level level_name
+                test_level(level) ? level_added : level_error
+            elsif options[:default]
+                level_name = BEM[:app]
+                level = Rails.root.join BEM[:root], level_name
+                make_level_assets_path level
+                update_assets_with_level level_name
+                test_level(level) ? level_added : level_error 
+            end       
+        end    
+    end
+
     protected
 
+    def test_level(level)
+        File.directory? level
+    end
+
+    def level_added
+        print_message("New level added successfully! Change BEM[:levels] in bem.rb for available levels.", "green")            
+    end
+
+    def level_error
+        print_message("Error! We have a trouble with connection to repository. Please, try again.", "red")
+    end
+
+    def level_assets_path
+        File.join(".bem", "assets")
+    end
+
+    def level_has_assets?(level)
+        File.directory? File.join level, level_assets_path
+    end
+
+    def update_assets_with_level(level)
+        BEM[:assets].each do |type, tech|
+            asset = File.join(Rails.root, "app", "assets", type.to_s, "application" + tech[:ext])
+            destination = [level, level_assets_path, type.to_s, "level" + tech[:ext]]  
+            create_file asset unless File.exist?(asset)       
+            append_file asset, "\n#{ tech[:import] } #{ File.join(destination) }#{ tech[:postfix] }"
+        end
+    end
+
+    def make_level_assets_path(level)
+       BEM[:assets].each do |type, tech|
+            create_file File.join level, level_assets_path, type.to_s, "level" + tech[:ext]
+        end 
+    end
+
     def essence_exist?(essence_dir)
-        File.directory?(File.join(BEM[:blocks][:path], essence_dir))
+        File.directory? File.join BEM[:blocks][:path], essence_dir
     end
 
     def create_essence(essence_options, path)
@@ -79,7 +154,7 @@ class Bem < Thor
         # directory. Watch existing templates for example.
         # What is .tt? It is custom extension for finding templates in other files.
         if options[:tech] # Maybe recive from command line
-            template "#{options[:tech]}.tt", File.join(essence_options[:path], path, names[:name], names[:name] + BEM[:techs][options[:tech].to_sym])
+            template "#{ options[:tech] }.tt", File.join(essence_options[:dir], path, names[:name], names[:name] + BEM[:techs][options[:tech].to_sym])
         else
             create_defaults(essence_options, path, names)
         end
@@ -87,33 +162,37 @@ class Bem < Thor
 
     def create_defaults(essence_options, path, names)
         BEM[:default].each do |tech|
-            template "#{tech}.tt", File.join(essence_options[:path], path, names[:name], names[:name] + BEM[:techs][tech])
+            template "#{ tech }.tt", File.join(essence_options[:dir], path, names[:name], names[:name] + BEM[:techs][tech])
         end
     end
 
     def remove_essence(essence_options, path)
         names = generate_names
-        destination = File.join(essence_options[:path], path, names[:name])
+        destination = File.join(essence_options[:dir], path, names[:name])
         destination = File.join(destination, names[:name] + BEM[:techs][options[:tech].to_sym]) if options[:tech]
-        FileUtils.rm_rf(destination)
-
-        puts "\e[0;31m      remove\e[0m  " + destination.to_s.gsub(Rails.root.to_s + "/", "")
+        remove_dir destination
     end
 
     def update_assets(name, path)
+        level = BEM[:level]
+        level ||= options[:level]  
         BEM[:assets].each do |type, tech|
-            asset = File.join(Rails.root, "app", "assets", type.to_s, "application" + tech[:ext])
-            destination = [path, name, name + tech[:ext]].reject(&:empty?)
-            line = "#{tech[:import]} #{File.join(destination)}#{tech[:postfix]}"
-            File.open(asset, "a") { |f| f.write("\n" + line) }
+            asset = File.join(Rails.root, BEM[:root], level, level_assets_path, type.to_s, "level" + tech[:ext])
+            # BEM[:root] > level > .bem > assets
+            # 4 ../
+            destination = ["../../../../", path, name, name + tech[:ext]].reject(&:empty?)
+            create_file asset unless File.exist?(asset)              
+            append_file asset, "\n#{ tech[:import] } #{ File.join(destination) }#{ tech[:postfix] }"
         end
     end
 
     def cut_assets(name, path)
+        level = BEM[:level]
+        level ||= options[:level]  
         BEM[:assets].each do |type, tech|
-            asset = File.join(Rails.root, "app", "assets", type.to_s, "application" + tech[:ext])
-            destination = [path, name, name + tech[:ext]].reject(&:empty?)
-            line = "#{tech[:import]} #{File.join(destination)}#{tech[:postfix]}"
+            asset = File.join(Rails.root, BEM[:root], level, level_assets_path, type.to_s, "level" + tech[:ext])
+            destination = ["../../../../", path, name, name + tech[:ext]].reject(&:empty?)
+            line = "#{ tech[:import] } #{ File.join(destination) }#{ tech[:postfix] }"
 
             tmp = Tempfile.new("temp")
             open(asset, 'r').each do |l|
@@ -180,8 +259,7 @@ class Bem < Thor
                 cut_assets(ess_name, path)
             when :usage
                 search_usage_information(ess_name, path) if essence_exist?(destination)
-            else raise print_message("You should set params. Try 'thor help bem:#{action}' for more information", 'red')
+            else raise print_message("You should set params. Try 'thor help bem:#{ action }' for more information", 'red')
         end
     end
-
 end

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

@@ -1,6 +1,12 @@
 BEM = {}
 
-BEM[:attrs] = [:block, :elem, :mods, :elemMods, :bem, :js, :jsAttr, :cls, :tag, :mix, :content]
+BEM[:root] = "bem"
+BEM[:attrs] = [:block, :elem, :mods, :elemMods, :bem, :js, :jsAttr, :cls, :tag, :mix, :content, :attrs]
+BEM[:levels] = []
+
+BEM[:app] = Rails.application.class.to_s.split("::").first.underscore.split('_').map(&:downcase).join('-')
+BEM[:levels].push({ name: BEM[:app] }) # levels stack
+BEM[:level] = BEM[:app] # default level
 
 # List of known techs.
 BEM[:techs] = {
@@ -25,8 +31,7 @@ BEM[:usage] = [:md, :wiki]
 # Default directories, try to customize.
 # Blocks directory in root of rails app.
 BEM[:blocks] = {
-  dir: "blocks",
-  path: Rails.root.join("blocks"),
+  dir: BEM[:root],
   prefix: "",
   postfix: ""
 }
@@ -34,7 +39,6 @@ BEM[:blocks] = {
 # Write 'dir: ""' for creating elements in root of block.
 BEM[:elements] = {
   dir: "elements",
-  path: BEM[:blocks][:path], # This is individualy for every block
   prefix: "__",
   postfix: ""
 }
@@ -42,7 +46,6 @@ BEM[:elements] = {
 # Write 'dir: ""' for creating mods in root of block.
 BEM[:mods] = {
   dir: "mods",
-  path: BEM[:blocks][:path], # This is individualy for every block or element
   prefix: "_",
   postfix: ""
 }
@@ -76,4 +79,4 @@ BEM[:assets] = {
 # You must use application files in
 # assets as a configs, don't write code in them.
 # This is need to sprokets includes.
-Rails.application.config.assets.paths << BEM[:blocks][:dir]
+Rails.application.config.assets.paths << BEM[:root]

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

@@ -9,7 +9,8 @@ module Bemonrails
         end
 
         ActiveSupport.on_load :action_controller do
-            before_filter { prepend_view_path(BEM[:blocks][:dir]) }
+            include Bemonrails::Levels
+            before_filter :parse_bem_levels
         end
     end
 

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

@@ -1,3 +1,3 @@
 module Bemonrails
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/bem-on-rails.rb

@@ -2,6 +2,7 @@ require "bem-on-rails/version"
 require "bem-on-rails/engine"
 require "bem-on-rails/build/bem_names"
 require "bem-on-rails/build/console_messages"
+require "bem-on-rails/build/levels"
 require "bem-on-rails/generators/install_generator"
 require 'bem-on-rails/railtie' if defined?(Rails)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bem-on-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Anton Winogradov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-22 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,12 +80,14 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- ToDo.md
 - app/helpers/bemonrails/bem_render_helper.rb
 - app/views/bemonrails/essences/_content.html.haml
 - bem-on-rails.gemspec
 - lib/bem-on-rails.rb
 - lib/bem-on-rails/build/bem_names.rb
 - lib/bem-on-rails/build/console_messages.rb
+- lib/bem-on-rails/build/levels.rb
 - lib/bem-on-rails/engine.rb
 - lib/bem-on-rails/generators/install_generator.rb
 - lib/bem-on-rails/generators/templates/config/initializer.tt.rb