rbss 0.2.2 → 0.2.3

data/Gemfile

@@ -1,12 +1,2 @@
 source "http://rubygems.org"
-
-gemspec
-
-group :development do
-  gem "jquery-rails"
-  gem "shoulda", ">= 0"
-  gem "rdoc", "~> 3.12"
-  gem "bundler"
-  gem "jeweler", "~> 1.8.4"
-  gem "simplecov"
-end
+gemspec

data/Gemfile.lock

@@ -1,83 +1,37 @@
 PATH
   remote: .
   specs:
-    rbss (0.2.2)
+    rbss (0.2.3)
+      rbss
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    bourne (1.4.0)
-      mocha (~> 0.13.2)
-    builder (3.0.4)
-    erubis (2.7.0)
+    diff-lcs (1.2.4)
     git (1.2.5)
-    hike (1.2.2)
-    i18n (0.6.1)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
-    journey (1.0.4)
-    jquery-rails (2.2.1)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
     json (1.7.7)
-    metaclass (0.0.1)
-    mocha (0.13.3)
-      metaclass (~> 0.0.1)
     multi_json (1.7.2)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
     rake (10.0.4)
     rdoc (3.12.2)
       json (~> 1.4)
-    shoulda (3.4.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (~> 1.0, >= 1.4.1)
-    shoulda-context (1.1.1)
-    shoulda-matchers (1.5.6)
-      activesupport (>= 3.0.0)
-      bourne (~> 1.3)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    thor (0.18.1)
-    tilt (1.3.7)
+    sqlite3 (1.3.7)
 
 PLATFORMS
   ruby
@@ -85,8 +39,8 @@ PLATFORMS
 DEPENDENCIES
   bundler
   jeweler (~> 1.8.4)
-  jquery-rails
   rbss!
   rdoc (~> 3.12)
-  shoulda
+  rspec
   simplecov
+  sqlite3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/rbss/base.rb

@@ -2,79 +2,49 @@ module Rbss
   class Base
     def initialize(files)
       if files.is_a?(Array)
-        @files = files
+        @@files = files
       elsif files.is_a?(String)
-        @files = files.split(',')
+        @@files = files.split(',')
       elsif files.is_a?(Symbol)
-        @files = [files.to_s]
+        @@files = [files.to_s]
+      elsif files.is_a?(NilClass)
+        @@files = nil
       else
         raise 'List of files must be either an Array of Strings or a String of files seperated by commas'
       end
 
-      @top_stack_level = caller.size - 1
-      @stack = [[@top_stack_level, nil, Selector.new(nil,nil)]] # stack level, name, object
-      @fake_stack = nil
-    end
-
-    def read(root = defined?(Rails) ? "#{Rails.root.join('app', 'assets', 'stylesheets')}/" : nil)
-      @files.each do |file|
-        finder = "#{root}#{file}.rbss"
-        eval File.open(finder).read
-      end
-    end
-
-    def parse
-      css = ''
-      @stack.last(@stack.size-1).each do |pancake|
-        css << "#{pancake[1]}{"
-        pancake[2].properties.each do |property|
-          css << "#{property.name.gsub('_','-')}:#{property.value};"
-        end
-        css << "}"
-      end
-      "<style>" + css + "</style>"
-    end
-
-    def evaluate(options = {})
-      read
-      parse
+      @@top_stack_level = caller.size - 1
+      @@stack = [[@@top_stack_level, nil, Selector.new(nil,nil)]] # stack level, name, object
+      @@fake_stack = nil
     end
 
     def method_missing(method_name, *args, &block)
-      if !@fake_stack.nil?
-        stack_level = @fake_stack
-        @fake_stack = nil
+      if !@@fake_stack.nil?
+        stack_level = @@fake_stack
+        @@fake_stack = nil
       else
-        stack_level = caller.size
+        stack_level = caller.size - (@offset || 0)
       end
 
-      reverse_stack = @stack.reverse
+      reverse_stack = @@stack.reverse
       parent = reverse_stack[0]
       i = 0
-      until parent[0] < stack_level || parent[0] == @top_stack_level
+      until parent[0] < stack_level || parent[0] == @@top_stack_level
         i += 1
         parent = reverse_stack[i]
       end
-
+      
       if block_given?
         selector = Selector.new(method_name.to_s, args)
-        if stack_level != @top_stack_level
+        if stack_level != @@top_stack_level
           selector.identify_parent(parent[1])
         end
-        @stack = @stack << [stack_level, selector.name, selector]
+        @@stack = @@stack << [stack_level, selector.name, selector]
         yield
       else
         property = Property.new(method_name.to_s, args.first)
         parent[2].add_to_properties(property)
       end
     end
-
-    def p(*args, &block)
-      @fake_stack = caller.size
-      method_missing('p', *args) do
-        yield
-      end
-    end
-
   end
 end

data/lib/rbss/custom.rb

@@ -0,0 +1,7 @@
+module Rbss
+  class Custom < Base
+    def initialize
+      @offset = 1
+    end
+  end
+end

data/lib/rbss/helper.rb

@@ -2,7 +2,7 @@ module Rbss
   module ApplicationHelper
 
     def rbss(files, options = {})
-      Rbss::Base.new(files).evaluate(options).html_safe
+      Rbss::Parser.new(files).evaluate(options).html_safe
     end
 
   end

data/lib/rbss/parser.rb

@@ -0,0 +1,35 @@
+module Rbss
+  class Parser < Base
+    def read(root = defined?(Rails) ? "#{Rails.root.join('app', 'assets', 'stylesheets')}/" : nil)
+      @@files.each do |file|
+        finder = "#{root}#{file}.rbss"
+        eval File.open(finder).read
+      end
+    end
+
+    def parse
+      css = ''
+      @@stack.last(@@stack.size-1).each do |pancake|
+        css << "#{pancake[1]}{"
+        pancake[2].properties.each do |property|
+          css << "#{property.name.gsub('_','-')}:#{property.value};"
+        end
+        css << "}"
+      end
+      "<style>" + css + "</style>"
+    end
+
+    def evaluate(options = {})
+      read
+      parse
+    end
+
+    def p(*args, &block)
+      @@fake_stack = caller.size
+      method_missing('p', *args) do
+        yield
+      end
+    end
+
+  end
+end

data/lib/rbss/railtie.rb

@@ -1,8 +1,5 @@
 module Rbss
   class RbssRailtie < Rails::Railtie
-    # initializer "rbss_railtie.configure_rails_initialization" do
-    #   ActionView::Base.send :include, Rbss::ApplicationHelper
-    # end
     config.to_prepare do
       ActionView::Base.send :include, Rbss::ApplicationHelper
     end

data/lib/rbss/rbss.rb

@@ -1,4 +1,6 @@
 require_relative 'base'
+require_relative 'parser'
+require_relative 'custom'
 require_relative 'property'
 require_relative 'selector'
 if defined?(Rails)

data/rbss.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rbss"
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gabriel Scholz"]
-  s.date = "2013-04-28"
+  s.date = "2013-05-02"
   s.description = "Generates minified CSS by reading the stack level through method missing calls."
   s.email = "gabe.scholz@zozi.com"
   s.extra_rdoc_files = [
@@ -25,7 +25,9 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/rbss.rb",
     "lib/rbss/base.rb",
+    "lib/rbss/custom.rb",
     "lib/rbss/helper.rb",
+    "lib/rbss/parser.rb",
     "lib/rbss/property.rb",
     "lib/rbss/railtie.rb",
     "lib/rbss/rbss.rb",
@@ -33,9 +35,10 @@ Gem::Specification.new do |s|
     "lib/rbss/version.rb",
     "lib/tasks/rbss-tasks.rake",
     "rbss.gemspec",
-    "spec/rbss_base_spec.rb",
+    "spec/rbss_parser_spec.rb",
     "spec/spec_helper.rb",
     "spec/test/complex.rbss",
+    "spec/test/css_class.rbss",
     "spec/test/simple.rbss",
     "test/dummy/README.rdoc",
     "test/dummy/Rakefile",
@@ -79,4 +82,34 @@ Gem::Specification.new do |s|
   s.rubygems_version = "1.8.23"
   s.summary = "Generate minified CSS in Ruby on Rails."
 
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rbss>, [">= 0"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
+    else
+      s.add_dependency(%q<rbss>, [">= 0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rbss>, [">= 0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
+  end
 end
+

data/spec/rbss_parser_spec.rb

@@ -0,0 +1,40 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Rbss::Parser do
+
+  subject { described_class.new(file) }
+
+  context "when evaluating a simple file" do
+    let(:file) { "spec/test/simple" }
+    let(:expected_result) { "body{color:black;width:95px;}span.bacon{padding:50px;font-size:16px;}span.bacon div#div{color:yellow;}span.bacon div#div div.class{width:44px;}span.bacon div.potato{text-align:right;}#cats{height:100px;}" }
+
+    its(:evaluate) { should == wrap_in_style { expected_result } }
+
+    context "when evaluating a simple file twice" do
+      subject { described_class.new([file, file]) }
+      its(:evaluate) { should == wrap_in_style { expected_result + expected_result } }
+    end
+  end
+
+  context "when evaluating a complex file" do
+    let(:file) { "spec/test/complex" }
+    let(:expected_result) { "body#okay.goodbye{width:95px;color:white;}body#okay.goodbye a.success{margin:1px 1px;}" }
+    
+    its(:evaluate) { should == wrap_in_style { expected_result } }
+  end
+
+  context "When evaluating methods of a css class file" do
+    let(:file) { "spec/test/css_class" }
+    let(:expected_result) { "canvas{height:50px;width:100px;}" }
+
+    its(:evaluate) { should == "<style>" + expected_result + "</style>" }
+
+    context "Where there is a css class file and a simple" do
+      let(:another_file) { "spec/test/complex" }
+      let(:another_expected_result) { "body#okay.goodbye{width:95px;color:white;}body#okay.goodbye a.success{margin:1px 1px;}" }
+      subject { described_class.new([file, another_file]) }
+
+      its(:evaluate) { should == wrap_in_style { expected_result + another_expected_result } }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -10,3 +10,8 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 RSpec.configure do |config|
   
 end
+
+#helper methods
+def wrap_in_style
+  "<style>" + yield + "</style>"
+end

data/spec/test/css_class.rbss

@@ -0,0 +1,10 @@
+class SomeCSSClass < Rbss::Custom
+  def build_it
+    canvas do
+      height '50px'
+      width '100px'
+    end
+  end
+end
+
+SomeCSSClass.new.build_it

data/test/dummy/app/assets/javascripts/application.js

@@ -10,6 +10,4 @@
 // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
 // GO AFTER THE REQUIRES BELOW.
 //
-//= require jquery
-//= require jquery_ujs
-//= require_tree .
+//= require_tree .

data/test/dummy/app/assets/stylesheets/my_file.rbss

@@ -1,3 +1,19 @@
+class SomeCSSClass < Rbss::Custom
+  def build_it
+    canvas do
+      height '50px'
+      width '100px'
+      dance_dance
+    end
+  end
+
+  def dance_dance
+    a '.submit' do
+      color 'blue'
+    end
+  end
+end
+
 html do
   font_size '500%'
 end
@@ -11,4 +27,9 @@ div do
   p '#blue' do
     color 'blue'
   end
+end
+
+div '#catface' do
+  text_align 'right'
+  SomeCSSClass.new.build_it
 end

data/test/dummy/app/helpers/application_helper.rb

@@ -1,3 +1,2 @@
 module ApplicationHelper
-
 end

data/test/dummy/config/initializers/secret_token.rb

@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = 'acd73408689b491d81d928d39791212e95da687e1bf0ea92f6dd1ddbe3a6bd67bf18d2e771fe42b7a6a276185a80f8bb8d1169346df4f2773c10586465a5f953'
+Dummy::Application.config.secret_token = 'd80d597ad490fdaf25f4f1c62aa6823f5e6e8dd8f7f74da299300ef609bdf90dbfec5c1360b63f2213d85325cf08ef24be584f3777a15dbe1936ff01033c52fa'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbss
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-28 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbss
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -140,7 +140,9 @@ files:
 - VERSION
 - lib/rbss.rb
 - lib/rbss/base.rb
+- lib/rbss/custom.rb
 - lib/rbss/helper.rb
+- lib/rbss/parser.rb
 - lib/rbss/property.rb
 - lib/rbss/railtie.rb
 - lib/rbss/rbss.rb
@@ -148,9 +150,10 @@ files:
 - lib/rbss/version.rb
 - lib/tasks/rbss-tasks.rake
 - rbss.gemspec
-- spec/rbss_base_spec.rb
+- spec/rbss_parser_spec.rb
 - spec/spec_helper.rb
 - spec/test/complex.rbss
+- spec/test/css_class.rbss
 - spec/test/simple.rbss
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
@@ -202,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2285444922700302913
+      hash: 3491439648690247056
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/spec/rbss_base_spec.rb

@@ -1,25 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe Rbss::Base do
-
-  context "when evaluating a simple file" do
-    let(:simple_file) { "spec/test/simple" }
-    let(:expected_result) { "body{color:black;width:95px;}span.bacon{padding:50px;font-size:16px;}span.bacon div#div{color:yellow;}span.bacon div#div div.class{width:44px;}span.bacon div.potato{text-align:right;}#cats{height:100px;}" }
-    subject { described_class.new(simple_file) }
-
-    its(:evaluate) { should == "<style>" + expected_result + "</style>" }
-
-    context "when evaluating a simple file twice" do
-      subject { described_class.new([simple_file, simple_file]) }
-      its(:evaluate) { should == "<style>" + expected_result + expected_result + "</style>" }
-    end
-  end
-
-  context "when evaluating a complex file" do
-    let(:complex_file) { "spec/test/complex" }
-    let(:expected_result) { "body#okay.goodbye{width:95px;color:white;}body#okay.goodbye a.success{margin:1px 1px;}" }
-    subject { described_class.new(complex_file) }
-
-    its(:evaluate) { should == "<style>" + expected_result + "</style>" }
-  end
-end