neat 1.1.0 → 1.2.0

data/app/assets/stylesheets/grid/_shift.scss

@@ -0,0 +1,6 @@
+@mixin shift($n-columns: 1) {
+  margin-left: $n-columns * flex-grid(1, $parent-columns) + $n-columns * flex-gutter($parent-columns);
+
+  // Reset nesting context
+  $parent-columns: $grid-columns;
+}

data/app/assets/stylesheets/grid/_span-columns.scss

@@ -0,0 +1,58 @@
+@mixin span-columns($span: $columns of $container-columns, $display: block) {
+
+  $columns: nth($span, 1);
+  $container-columns: container-span($span);
+  $display-table: false;
+
+  @if $container-columns != $grid-columns {
+    $parent-columns: $container-columns;
+  }
+
+  @else {
+    $parent-columns: $grid-columns;
+  }
+
+  @if $container-display-table == true {
+    $display-table: true;
+  }
+
+  @else if $display == table {
+    $display-table: true;
+  }
+
+  @else {
+    $display-table: false;
+  }
+
+  @if $display-table  {
+    display: table-cell;
+    padding-right: flex-gutter($container-columns);
+    width: flex-grid($columns, $container-columns) + flex-gutter($container-columns);
+
+    &:last-child {
+      width: flex-grid($columns, $container-columns);
+      padding-right: 0;
+    }
+  }
+
+  @else if $display == inline-block {
+    @include inline-block;
+    margin-right: flex-gutter($container-columns);
+    width: flex-grid($columns, $container-columns);
+
+    &:last-child {
+      margin-right: 0;
+    }
+  }
+
+  @else {
+    display: block;
+    float: left;
+    margin-right: flex-gutter($container-columns);
+    width: flex-grid($columns, $container-columns);
+
+    &:last-child {
+      margin-right: 0;
+    }
+  }
+}

data/app/assets/stylesheets/grid/_to-deprecate.scss

@@ -0,0 +1,52 @@
+@mixin breakpoint($query:$feature $value $columns, $total-columns: $grid-columns) {
+  @warn "The breakpoint() mixin was renamed to media() in Neat 1.0. Please update your project with the new syntax before the next version bump.";
+
+  @if length($query) == 1 {
+    @media screen and ($default-feature: nth($query, 1)) {
+      $default-grid-columns: $grid-columns;
+      $grid-columns: $total-columns;
+      @content;
+      $grid-columns: $default-grid-columns;
+    }
+  }
+
+  @else if length($query) == 2 {
+    @media screen and (nth($query, 1): nth($query, 2)) {
+      $default-grid-columns: $grid-columns;
+      $grid-columns: $total-columns;
+      @content;
+      $grid-columns: $default-grid-columns;
+    }
+  }
+
+  @else if length($query) == 3 {
+    @media screen and (nth($query, 1): nth($query, 2)) {
+      $default-grid-columns: $grid-columns;
+      $grid-columns: nth($query, 3);
+      @content;
+      $grid-columns: $default-grid-columns;
+    }
+  }
+
+  @else if length($query) == 4 {
+    @media screen and (nth($query, 1): nth($query, 2)) and (nth($query, 3): nth($query, 4)) {
+      $default-grid-columns: $grid-columns;
+      $grid-columns: $total-columns;
+      @content;
+      $grid-columns: $default-grid-columns;
+    }
+  }
+
+  @else if length($query) == 5 {
+    @media screen and (nth($query, 1): nth($query, 2)) and (nth($query, 3): nth($query, 4)) {
+      $default-grid-columns: $grid-columns;
+      $grid-columns: nth($query, 5);
+      @content;
+      $grid-columns: $default-grid-columns;
+    }
+  }
+
+  @else {
+    @warn "Wrong number of arguments for breakpoint(). Read the documentation for more details.";
+  }
+}

data/lib/neat/version.rb

@@ -1,3 +1,3 @@
 module Neat
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/lib/tasks/install.rake

@@ -1,5 +1,3 @@
-# Needed for pre-3.1.
-
 require "fileutils"
 require "find"
 

data/neat.gemspec

@@ -26,4 +26,8 @@ Neat is an open source grid framework built on top of Bourbon with the aim of be
 
   s.add_development_dependency('aruba', '~> 0.4')
   s.add_development_dependency('rake')
+  s.add_development_dependency('css_parser')
+  s.add_development_dependency('rspec')
+  s.add_development_dependency('rdoc')
+  s.add_development_dependency('bundler')
 end

data/spec/neat/columns_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe "@include span-columns()" do
+  let (:identifier) {"span-columns"}
+
+  before(:all) do
+    ParserSupport.parse_file(identifier)
+  end
+
+  context "with argument '6' in a twelve-column grid" do
+    it "sets width in percentage" do
+      expect('.span-columns-default').to have_rule('width: 48.82117%')
+    end
+
+    it "sets gutter in percentage" do
+      expect('.span-columns-default').to have_rule('margin-right: 2.35765%')
+    end
+
+    it "sets display to block" do
+      expect('.span-columns-default').to have_rule('display: block')
+    end
+
+    it "sets float to left" do
+      expect('.span-columns-default').to have_rule('float: left')
+    end
+
+    it "removes gutter from last element" do
+      expect('.span-columns-default:last-child').to have_rule('margin-right: 0')
+    end
+  end
+
+  context "when nested" do
+    it "sets relative width in percentage" do
+      expect('.span-columns-default .span-columns-nested').to have_rule('width: 30.11389%')
+    end
+
+    it "sets relative gutter in percentage" do
+      expect('.span-columns-default .span-columns-nested').to have_rule('margin-right: 4.82916%')
+    end
+  end
+
+  context "with argument 'table'" do
+    it "sets display to table-cell" do
+      expect('.span-columns-table').to have_rule('display: table-cell')
+    end
+
+    it "sets padding in percentage" do
+      expect('.span-columns-table').to have_rule('padding-right: 2.35765%')
+    end
+
+    it "substracts gutter from width of last element" do
+      expect('.span-columns-table:last-child').to have_rule('width: 48.82117%')
+    end
+  end
+
+  context "with argument 'inline-block'" do
+    it "sets display to inline-block" do
+      expect('.span-columns-inline-block').to have_rule('display: inline-block')
+    end
+  end
+end

data/spec/neat/container_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe "@include outer-container()" do
+  let (:identifier) {"outer-container"}
+
+  before(:all) do
+    ParserSupport.parse_file(identifier)
+  end
+
+  it "adds clearfix" do
+    expect('.container-default:after').to have_rule('clear: both')
+  end
+
+  it "sets max-width" do
+    expect('.container-default').to have_rule('max-width: 960px')
+  end
+end

data/spec/neat/media_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe "@include media()" do
+  let (:identifier) {"media"}
+
+  before(:all) do
+    ParserSupport.parse_file(identifier)
+  end
+
+  context "with argument '481px'" do
+    it "outputs (min-width: 481px)" do
+      expect('.media-default').to be_contained_in('screen and (min-width: 481px)')
+    end
+  end
+
+  context "with argument 'max-width 480px'" do
+    it "outputs (max-width: 480px)" do
+      expect('.media-max-width').to be_contained_in('screen and (max-width: 480px)')
+    end
+  end
+
+  context "with argument 'min-width 320px max-width 480px'" do
+    it "outputs (min-width: 320px) and (max-width: 480px)" do
+      expect('.media-min-max-width').to be_contained_in('screen and (min-width: 320px) and (max-width: 480px)')
+    end
+  end
+
+  context "with argument '481px, 6'" do
+    it "outputs (min-width: 481px)" do
+      expect('.change-media-context').to be_contained_in('screen and (min-width: 481px)')
+    end
+
+    it "uses a 6-column grid" do
+      expect('.change-media-context').to have_rule('width: 100%')
+    end
+  end
+
+  context "with argument 'max-width 480px 6'" do
+    it "outputs (max-width: 480px)" do
+      expect('.change-media-context-shorthand').to be_contained_in('screen and (max-width: 480px)')
+    end
+
+    it "uses a 6-column grid" do
+      expect('.change-media-context').to have_rule('width: 100%')
+    end
+  end
+end

data/spec/neat/omega_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+describe "@include omega()" do
+  let (:identifier) {"omega"}
+
+  before(:all) do
+    ParserSupport.parse_file(identifier)
+  end
+
+  context "with no argument" do
+    it "removes right margin" do
+      expect('.omega-default').to have_rule('margin-right: 0')
+    end
+  end
+
+  context "with argument 'table'" do
+    it "removes right padding" do
+      expect('.omega-table').to have_rule('padding-right: 0')
+    end
+  end
+
+  context "with argument 'block, left'" do
+    it "removes left margin" do
+      expect('.omega-block-left').to have_rule('margin-left: 0')
+    end
+  end
+
+  context "with argument 'table, left'" do
+    it "removes left padding" do
+      expect('.omega-table-left').to have_rule('padding-left: 0')
+    end
+  end
+
+  context "with argument '4n'" do
+    it "removes right margin of nth-child(4n)" do
+      expect('.omega-nth-default:nth-child(4n)').to have_rule('margin-right: 0')
+    end
+  end
+
+  context "with argument '4n table'" do
+    it "removes right padding of nth-child(4n)" do
+      expect('.omega-nth-table:nth-child(4n)').to have_rule('padding-right: 0')
+    end
+  end
+
+  context "with argument '4n block, left'" do
+    it "removes left margin of nth-child(4n)" do
+      expect('.omega-nth-default-left:nth-child(4n)').to have_rule('margin-left: 0')
+    end
+  end
+
+  context "with argument '4n table, left'" do
+    it "removes left padding of nth-child(4n)" do
+      expect('.omega-nth-table-left:nth-child(4n)').to have_rule('padding-left: 0')
+    end
+  end
+end

data/spec/neat/pad_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe "@include pad()" do
+  let (:identifier) {"pad"}
+
+  before(:all) do
+    ParserSupport.parse_file(identifier)
+  end
+
+  context "with no argument" do
+    it "sets padding to gutter percentage" do
+      expect('.pad-default').to have_rule('padding: 2.35765%')
+    end
+  end
+
+  context "with argument '20px'" do
+    it "sets padding to '20px'" do
+      expect('.pad-explicit').to have_rule('padding: 20px')
+    end
+  end
+
+  context "with argument '30px 20px 10px 5px'" do
+    it "sets padding to '30px 20px 10px 5px'" do
+      expect('.pad-shorthand').to have_rule('padding: 30px 20px 10px 5px')
+    end
+  end
+
+  context "with argument 'default' keyword" do
+    it "replaces 'default' with gutter percentage" do
+      expect('.pad-shorthand-default').to have_rule('padding: 30px 2.35765% 10px 2.35765%')
+    end
+  end
+end
+

data/spec/neat/row_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe "@include row()" do
+  let (:identifier) {"row"}
+
+  before(:all) do
+    ParserSupport.parse_file(identifier)
+  end
+
+  context "with no argument" do
+    it "adds clearfix" do
+      expect('.row-default:after').to have_rule('clear: both')
+    end
+
+    it "sets display to block" do
+      expect('.row-default').to have_rule('display: block')
+    end
+  end
+
+  context "with argument 'table'" do
+    it "sets display to table" do
+      expect('.row-table').to have_rule('display: table')
+    end
+
+    it "forces table-cell display on child elements" do
+      expect('.row-table-reset .block-child').to have_rule('display: table-cell')
+    end
+  end
+
+  context "with reset-display()" do
+    it "resets display to block" do
+      expect('.no-row').to have_rule('display: block')
+    end
+  end
+
+  context "with invalid display argument" do
+    it "sets display to block" do
+      expect('.row-invalid-display').to have_rule('display: block')
+    end
+  end
+end

data/spec/neat/shift_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe "@include shift()" do
+  let (:identifier) {"shift"}
+
+  before(:all) do
+    ParserSupport.parse_file(identifier)
+  end
+
+  context "with no argument" do
+    it "shifts element one column to the left" do
+      expect('.shift-default').to have_rule('margin-left: 8.5298%')
+    end
+  end
+
+  context "with argument '2'" do
+    it "shifts element 2 column to the left" do
+      expect('.shift-positive').to have_rule('margin-left: 17.05961%')
+    end
+  end
+
+  context "with argument '-3'" do
+    it "shifts element 3 column to the right" do
+      expect('.shift-negative').to have_rule('margin-left: -25.58941%')
+    end
+  end
+
+  context "when nested" do
+    it "shifts element relative to its parent" do
+      expect('.shifted-parent .shifted-child').to have_rule('margin-left: 34.94305%')
+    end
+
+    it "resets nesting context" do
+      expect('.post-nested-shift').to have_rule('margin-left: 17.05961%')
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,25 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'rspec'
+require 'neat'
+require 'aruba/api'
+require 'css_parser'
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+
+RSpec.configure do |config|
+  config.include BourbonSupport
+  config.include SassSupport
+  config.include CssParser
+  config.include ParserSupport
+  config.include Aruba::Api
+
+  config.before(:all) do
+    install_bourbon_files
+    generate_css
+  end
+
+  config.after(:all) do
+    remove_bourbon_files
+    clean_up
+  end
+end