neat 1.1.0 → 1.2.0

data/spec/support/bourbon_support.rb

@@ -0,0 +1,9 @@
+module BourbonSupport
+  def install_bourbon_files
+    `bourbon install --path test`
+  end
+
+  def remove_bourbon_files
+    FileUtils.rm_rf('test/bourbon')
+  end
+end

data/spec/support/matchers/be_contained_in.rb

@@ -0,0 +1,10 @@
+RSpec::Matchers.define :be_contained_in do |expected|
+  match do |actual|
+    @query = ParserSupport.parser.find_by_selector(actual, expected)
+    @query.any?
+  end
+
+  failure_message_for_should do |actual|
+      %{expected selector #{actual} to be contained in #{expected}}
+  end
+end

data/spec/support/matchers/have_rule.rb

@@ -0,0 +1,33 @@
+RSpec::Matchers.define :have_rule do |expected|
+  match do |actual|
+    @rules = rules_from_selector(actual)
+    @rules.include? expected
+  end
+
+  failure_message_for_should do |actual|
+    if @rules.empty?
+      %{no CSS rules for selector #{actual} were found}
+    else
+      %{expected selector #{actual} to have CSS rule "#{expected}"}
+    end
+  end
+
+  def rules_from_selector(selector)
+    rulesets = ParserSupport.parser.find_by_selector(selector)
+    if rulesets.empty?
+      []
+    else
+      rules(rulesets)
+    end
+  end
+
+  def rules(rulesets)
+    rules = []
+    rulesets.map do |ruleset|
+      ruleset.split(';').each do |rule|
+        rules << rule.strip
+      end
+    end
+    rules
+  end
+end

data/spec/support/parser_support.rb

@@ -0,0 +1,9 @@
+module ParserSupport
+  def self.parser
+    @parser ||= CssParser::Parser.new
+  end
+
+  def self.parse_file(identifier)
+    self.parser.load_file!("tmp/#{identifier}.css")
+  end
+end

data/spec/support/sass_support.rb

@@ -0,0 +1,10 @@
+module SassSupport
+  def generate_css
+    _mkdir('tmp')
+    `sass --update test:tmp --style expanded`
+  end
+
+  def clean_up
+    FileUtils.rm_rf('tmp')
+  end
+end

data/test/_setup.scss

@@ -0,0 +1,4 @@
+$border-box-sizing: false;
+
+@import 'bourbon/bourbon';
+@import 'app/assets/stylesheets/neat';

data/test/media.scss

@@ -0,0 +1,31 @@
+@import 'setup';
+
+.media-default {
+  @include media(481px) {
+    color: #000;
+  }
+}
+
+.media-max-width {
+  @include media(max-width 480px) {
+    position: relative;
+  }
+}
+
+.media-min-max-width {
+  @include media(min-width 320px max-width 480px) {
+    position: relative;
+  }
+}
+
+.change-media-context {
+  @include media(481px, 6) {
+    @include span-columns(6);
+  }
+}
+
+.change-media-context-shorthand {
+  @include media(max-width 480px 6) {
+    @include span-columns(6);
+  }
+}

data/test/omega.scss

@@ -0,0 +1,35 @@
+@import 'setup';
+
+.omega-default {
+  @include omega;
+  color: #000;
+}
+
+.omega-table {
+  @include omega(table);
+}
+
+.omega-block-left {
+  @include omega(block, left);
+  color: #000;
+}
+
+.omega-table-left{
+  @include omega(table, left);
+}
+
+.omega-nth-default {
+  @include omega(4n)
+}
+
+.omega-nth-table {
+  @include omega(4n table);
+}
+
+.omega-nth-default-left {
+  @include omega(4n block, left);
+}
+
+.omega-nth-table-left {
+  @include omega(4n table, left);
+}

data/test/outer-container.scss

@@ -0,0 +1,7 @@
+@import 'setup';
+
+$max-width: 960px;
+
+.container-default {
+  @include outer-container;
+}

data/test/pad.scss

@@ -0,0 +1,17 @@
+@import 'setup';
+
+.pad-default {
+  @include pad;
+}
+
+.pad-explicit {
+  @include pad(20px);
+}
+
+.pad-shorthand {
+  @include pad(30px 20px 10px 5px);
+}
+
+.pad-shorthand-default {
+  @include pad(30px default 10px default);
+}

data/test/row.scss

@@ -0,0 +1,26 @@
+@import 'setup';
+
+.row-default {
+  @include row;
+}
+
+.row-table {
+  @include row(table);
+}
+
+.row-invalid-display {
+  @include row(invalid-argument);
+}
+
+.row-table-reset {
+  @include row(table);
+
+  .block-child {
+    @include span-columns(4, block);
+    @include reset-display;
+  }
+}
+
+.no-row {
+  @include span-columns(4);
+}

data/test/shift.scss

@@ -0,0 +1,27 @@
+@import 'setup';
+
+.shift-default {
+  @include shift;
+}
+
+.shift-positive {
+  @include shift(2);
+}
+
+.shift-negative {
+  @include shift(-3);
+}
+
+// Nesting
+.shifted-parent {
+  @include span-columns(6);
+
+  .shifted-child {
+    @include span-columns(2 of 6);
+    @include shift(2);
+  }
+}
+
+.post-nested-shift {
+  @include shift(2);
+}

data/test/span-columns.scss

@@ -0,0 +1,17 @@
+@import 'setup';
+
+.span-columns-default {
+  @include span-columns(6);
+
+  .span-columns-nested {
+    @include span-columns(2 of 6);
+  }
+}
+
+.span-columns-table {
+  @include span-columns(6, table);
+}
+
+.span-columns-inline-block {
+  @include span-columns(6, inline-block);
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neat
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70352051553640 !ruby/object:Gem::Requirement
+  requirement: &70172351236160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70352051553640
+  version_requirements: *70172351236160
 - !ruby/object:Gem::Dependency
   name: bourbon
-  requirement: &70352051532700 !ruby/object:Gem::Requirement
+  requirement: &70172351233920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70352051532700
+  version_requirements: *70172351233920
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70352051530620 !ruby/object:Gem::Requirement
+  requirement: &70172351232100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70352051530620
+  version_requirements: *70172351232100
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70352051528300 !ruby/object:Gem::Requirement
+  requirement: &70172351231020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,7 +56,51 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70352051528300
+  version_requirements: *70172351231020
+- !ruby/object:Gem::Dependency
+  name: css_parser
+  requirement: &70172351229140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70172351229140
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70172351227520 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70172351227520
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70172351189640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70172351189640
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70172351188860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70172351188860
 description: ! 'Neat is an open source grid framework built on top of Bourbon with
   the aim of being easy enough to use out of the box and flexible enough to customize
   down the road.
@@ -70,6 +114,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
@@ -81,9 +126,17 @@ files:
 - app/assets/stylesheets/functions/_new-breakpoint.scss
 - app/assets/stylesheets/functions/_private.scss
 - app/assets/stylesheets/functions/_px-to-em.scss
+- app/assets/stylesheets/grid/_fill-parent.scss
 - app/assets/stylesheets/grid/_global-variables.scss
 - app/assets/stylesheets/grid/_grid.scss
+- app/assets/stylesheets/grid/_media.scss
 - app/assets/stylesheets/grid/_omega.scss
+- app/assets/stylesheets/grid/_outer-container.scss
+- app/assets/stylesheets/grid/_pad.scss
+- app/assets/stylesheets/grid/_row.scss
+- app/assets/stylesheets/grid/_shift.scss
+- app/assets/stylesheets/grid/_span-columns.scss
+- app/assets/stylesheets/grid/_to-deprecate.scss
 - app/assets/stylesheets/grid/_visual-grid.scss
 - app/assets/stylesheets/settings/_grid.scss
 - app/assets/stylesheets/settings/_visual-grid.scss
@@ -94,6 +147,27 @@ files:
 - lib/neat/version.rb
 - lib/tasks/install.rake
 - neat.gemspec
+- spec/neat/columns_spec.rb
+- spec/neat/container_spec.rb
+- spec/neat/media_spec.rb
+- spec/neat/omega_spec.rb
+- spec/neat/pad_spec.rb
+- spec/neat/row_spec.rb
+- spec/neat/shift_spec.rb
+- spec/spec_helper.rb
+- spec/support/bourbon_support.rb
+- spec/support/matchers/be_contained_in.rb
+- spec/support/matchers/have_rule.rb
+- spec/support/parser_support.rb
+- spec/support/sass_support.rb
+- test/_setup.scss
+- test/media.scss
+- test/omega.scss
+- test/outer-container.scss
+- test/pad.scss
+- test/row.scss
+- test/shift.scss
+- test/span-columns.scss
 homepage: https://github.com/thoughtbot/neat
 licenses: []
 post_install_message: 
@@ -108,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1950241024261928513
+      hash: 3740631716143461963
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -117,11 +191,32 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1950241024261928513
+      hash: 3740631716143461963
 requirements: []
 rubyforge_project: neat
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A fluid grid framework on top of Bourbon
-test_files: []
+test_files:
+- spec/neat/columns_spec.rb
+- spec/neat/container_spec.rb
+- spec/neat/media_spec.rb
+- spec/neat/omega_spec.rb
+- spec/neat/pad_spec.rb
+- spec/neat/row_spec.rb
+- spec/neat/shift_spec.rb
+- spec/spec_helper.rb
+- spec/support/bourbon_support.rb
+- spec/support/matchers/be_contained_in.rb
+- spec/support/matchers/have_rule.rb
+- spec/support/parser_support.rb
+- spec/support/sass_support.rb
+- test/_setup.scss
+- test/media.scss
+- test/omega.scss
+- test/outer-container.scss
+- test/pad.scss
+- test/row.scss
+- test/shift.scss
+- test/span-columns.scss