staple 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdae37d53047398c261f9f1ce6e67b6090812fe3
-  data.tar.gz: fd6a7bb935dd778e853f7b745ddd57ef8c84e92d
+  metadata.gz: 37dd82594a55d207062a5af33d61fb567c71fbfe
+  data.tar.gz: 7202ea9aa3e87dc080eb76a04395e7074cc049d6
 SHA512:
-  metadata.gz: ead6d5cf343270544f9dd8c4fbdbc6b62a0a30b87d402953550d68bcea0fb37648345458e873f12171dbeda8f1c4bb326880c073967e11f9a72debb0f20bab89
-  data.tar.gz: db4f288e2da1be547392f25652f457dbb3b90a4638b13e0c659e58d785e4e132f6601f04a036ac286387e9509a77c562083cb8439a5b7e1b44a3d7ff28bef91b
+  metadata.gz: dfc0a4c443f5af11b4dbd00872f0d3deef55dc60648bb6387d4a572472ab60ef20bf6fe764b15e621b74f5c8b6c8eb8d37facc956e6b7c14e540e1a0cd52de0d
+  data.tar.gz: 61db24a5db834c7e375c9f39be0013d5e0821d18413082e7e61d11b864264879a13614e783641b02f18a8a1c5dbab909c55e7adc4db5c987ca4792b02eda8016

data/README.md

@@ -9,23 +9,29 @@ a modular ui framework for rails built on top of foundation and sass.
 * keep it simple
 
 ##todo
-
-* component based generators
-* fix plastic, flat theme selectors. Focus color.
+* expand library and integration tests
+* import web components
 
 ##lower priority todo
 * don't require other gems
 * integration with existing projects
 * reinstall places foundation again then does replace, separate generator for update?
-* variables generator:
+* create executables
+* Demarcate each pattern in scss (atom) with comment
+* add colors to accent, buttons? gen?
+* seperate if file contains into method.
+* check before import if already there (import font)
+* integrate:
+	* background, paragraph, etc vars
+	* append into generators
+	* generator for form colors from button list
+	* on sizes?:
 	* radius
 	* font
 	* primary-color
 	* border-size
 	* change amount (color dif, hover dif)
-* create executables
-* Demarcate each pattern in scss (atom) with comment
-* Make errors verbose. Print full command on low level.
+* refactor generator code from low priority
 
 ##Install
 
@@ -67,9 +73,9 @@ rails g staple:install
 * rails g staple:forms amputate inverse
 
 ###colors*
-* rails g staple:colors import secondary:blue
-* rails g staple:colors append fave:aqua //adds new color and generate class: button, accent?
+* rails g staple:colors import primary:blue//adds if doesn't exist
 * rails g staple:colors remove fave // removes color declaration
+* rails g staple:colors import primary-color:'rgba(22,23,0,0.9)' //explicit declaration
 
 ###typography*
 * rails g staple:typography import typeface-primary:Roboto

data/lib/staple.rb

@@ -1,4 +1,8 @@
 require 'staple/buttons_generator'
 require 'staple/forms_generator'
+require 'staple/colors_generator'
+require 'staple/typography_generator'
+require 'staple/tables_generator'
 require 'staple/theme_generator'
 require 'staple/install_generator'
+require 'staple/reset_generator'

data/lib/staple/colors_generator.rb

@@ -0,0 +1,85 @@
+require 'rails/generators'
+
+module Staple
+  class ColorsGenerator < Rails::Generators::Base
+    desc 'pending'
+    source_root File.join(File.dirname(__FILE__), '..', '..')
+    argument :actions, :type => :array, :default => []
+
+    def delegate
+        case "#{action}"
+        when "import"
+            import
+        when "remove"
+            remove
+        else
+            puts "unknown command"
+        end
+    end
+
+    private
+
+    #ACTIONS
+
+    def import
+        puts "#{component} import #{variable} -> #{color}"
+        if File.readlines(filename).any?{ |l| l["$#{variable}:"] }
+            #replace line w/ new
+            gsub_file(filename, /\$#{variable}:.*$/, "$#{variable}: #{contents};") if contents
+            gsub_file(filename, /\$#{variable}:.*$/, "$#{variable}: #{color};") if !contents
+        else
+            #create variable w/color
+            gsub_file(filename, "//&*append", "$#{variable}: #{contents};\n//&*append") if contents
+            gsub_file(filename, "//&*append", "$#{variable}: #{color};\n//&*append") if !contents
+        end
+        #check for variable, if yes: replace line, if no, create
+    end
+
+    def remove
+        #check for variable, and remove line
+        gsub_file(filename, /\$#{variable}:.*$/, "")
+    end
+
+    #HELPER METHODS
+
+    def contents
+        file = File.join(self.class.source_root, 'source', 'styles', "#{component}", "#{color.dasherize}.color")
+        get_file(file)
+    end
+
+    def get_file(file)
+        if File.file?(file)
+            return File.read(file)
+        else
+            return false
+        end
+    end
+
+    def filename
+        "app/assets/stylesheets/staple/#{component}.scss"
+    end
+
+    def not_valid
+        !contents
+    end
+
+    #DEFINE
+
+    def action
+        actions[0]
+    end
+
+    def variable
+        actions[1].split(":").first
+    end
+
+    def color
+        actions[1].split(":").last
+    end
+
+    def component
+        "colors"
+    end
+
+  end
+end

data/lib/staple/forms_generator.rb

@@ -62,8 +62,8 @@ module Staple
         end
     end
 
-    def not_valid
-        !contents || !focus || !error
+    def not_valid?
+        !contents && !focus && !error
     end
 
     #DEFINE

data/lib/staple/reset_generator.rb

@@ -0,0 +1,18 @@
+require 'rails/generators'
+
+module Staple
+  class ResetGenerator < Rails::Generators::Base
+    desc 'bring in the staple'
+    source_root File.join(File.dirname(__FILE__), '..', '..')
+    argument :actions, :type => :array, :default => []
+
+    def reset
+        components = %w(buttons colors forms tables typography sizes)
+        components.each do |c|
+            copy_file "source/styles/staple/#{c}.scss", "app/assets/stylesheets/staple/#{c}.scss", :force => true
+            copy_file "source/styles/staple/builders/build_#{c}.scss", "app/assets/stylesheets/staple/builders/build_#{c}.scss", :force => true
+        end
+    end
+
+  end
+end

data/lib/staple/tables_generator.rb

@@ -0,0 +1,66 @@
+require 'rails/generators'
+
+module Staple
+  class TablesGenerator < Rails::Generators::Base
+    desc 'pending'
+    source_root File.join(File.dirname(__FILE__), '..', '..')
+    argument :actions, :type => :array, :default => []
+
+    def delegate
+        case "#{action}"
+        when "import"
+            import
+        when "remove"
+            remove
+        else
+            puts "unknown command"
+        end
+    end
+
+    private
+
+    #ACTIONS
+
+    def import
+        puts "#{component} import #{pattern}"
+        gsub_file "app/assets/stylesheets/staple/#{component}.scss", "//&*default", "\n\t#{contents}//&*default" if contents
+
+        puts "invalid operation: #{component} import #{pattern}. for available actions: rails g staple:list [option]" if !contents
+    end
+
+    def remove
+        puts "#{component} remove #{pattern}"
+        gsub_file "app/assets/stylesheets/staple/#{component}.scss", "\n\t#{contents}", "" if contents
+    end
+
+    #HELPER METHODS
+
+    def contents
+        file = File.join(self.class.source_root, 'source', 'styles', "#{component}", "#{pattern.dasherize}.scss")
+        get_file(file)
+    end
+
+    def get_file(file)
+        if File.file?(file)
+            return File.read(file)
+        else
+            return false
+        end
+    end
+
+    #DEFINE
+
+    def action
+        actions[0]
+    end
+
+    def pattern
+        actions[1]
+    end
+
+    def component
+        "tables"
+    end
+
+  end
+end

data/lib/staple/theme_generator.rb

@@ -9,7 +9,7 @@ module Staple
     def call_generators
         if global?
             #call self with each
-            components = %w(buttons colors forms sizes tables typography)
+            components = %w(buttons colors forms tables typography)
             components.each do |c|
                 generate "staple:theme", "#{c}", "#{theme}"
             end

data/lib/staple/typography_generator.rb

@@ -0,0 +1,88 @@
+require 'rails/generators'
+
+module Staple
+  class TypographyGenerator < Rails::Generators::Base
+    desc 'pending'
+    source_root File.join(File.dirname(__FILE__), '..', '..')
+    argument :actions, :type => :array, :default => []
+
+    def delegate
+        case "#{action}"
+        when "import"
+            import
+        when "remove"
+            remove
+        else
+            puts "unknown command"
+        end
+    end
+
+    private
+
+    #ACTIONS
+
+    def import
+        puts "#{component} import #{variable} -> #{typeface}"
+        if File.readlines(filename).any?{ |l| l["$#{variable}:"] }
+            #replace line w/ new
+            gsub_file(filename, /\$#{variable}:.*$/, "$#{variable}: #{contents};") if contents
+            gsub_file(filename, "//&*import", "\n#{import_type}//&*import") if import_type
+            gsub_file(filename, /\$#{variable}:.*$/, "$#{variable}: #{typeface};") if !contents
+        else
+            #create variable w/color
+            gsub_file(filename, "//&*append", "$#{variable}: #{contents};\n//&*append") if contents
+            gsub_file(filename, "//&*append", "$#{variable}: #{typeface};\n//&*append") if !contents
+        end
+        #check for variable, if yes: replace line, if no, create
+    end
+
+    def remove
+        #check for variable, and remove line
+        gsub_file(filename, /\$#{variable}:.*$/, "")
+        gsub_file(filename, "\n#{import_type}", "") if import_type
+    end
+
+    #HELPER METHODS
+
+    def contents
+        file = File.join(self.class.source_root, 'source', 'styles', "#{component}", "#{typeface.dasherize}.typeface")
+        get_file(file)
+    end
+
+    def import_type
+        file = File.join(self.class.source_root, 'source', 'styles', "#{component}", "#{typeface.dasherize}-import.scss")
+        get_file(file)
+    end
+
+    def get_file(file)
+        if File.file?(file)
+            return File.read(file)
+        else
+            return false
+        end
+    end
+
+    def filename
+        "app/assets/stylesheets/staple/#{component}.scss"
+    end
+
+    #DEFINE
+
+    def action
+        actions[0]
+    end
+
+    def variable
+        actions[1].split(":").first
+    end
+
+    def typeface
+        actions[1].split(":").last
+    end
+
+    def component
+        "typography"
+    end
+
+  end
+end

data/source/styles/colors/themes/flatland.theme

@@ -1,5 +1,2 @@
 secondary:green
-tertiary:yellow
-background:rgba(25,228,20,0.5) //set more vars than just primary
-primary:#477
-paragraph:red//if available, import file, else, use explicit declaration
+tertiary:yellow

data/source/styles/colors/themes/plastic.theme

@@ -1,3 +1,3 @@
-background:rgba(25,228,20,0.5) //set more vars than just primary
-primary:#477
-paragraph:red//if available, import file, else, use explicit declaration
+background:'rgba(25,228,20,0.5)'
+primary:'#477'
+paragraph:blue

data/source/styles/forms/margin-bottom.scss

@@ -1 +1 @@
-margin-bottom: 15px;
+margin-bottom: 12px;

data/source/styles/forms/plastic-bubble-error.scss

@@ -1,10 +1,10 @@
 div.error{
-	*{
+	input{
 		background: lighten($alert-color, 40%);
 		border: 2px solid lighten($alert-color, 40%);
 		border-top: 2px solid $alert-color;
 	}
-	*:focus{
+	input:focus{
 		background: white;
 		border-color: 2px solid $alert-color;
 	}

data/source/styles/forms/plastic-bubble-focus.scss

@@ -1,2 +1 @@
-background: #fff;
-border: 2px solid $primary-color;
+background: #fff;

data/source/styles/forms/shaded-error.scss

@@ -1,9 +1,9 @@
 div.error{
-	*{
+	input{
 		background-color: lighten($alert-color, 40%);
 		border-color: lighten($alert-color, 40%);
 	}
-	*:focus{
+	input:focus{
 		background: white;
 		border-color: $alert-color;
 	}

data/source/styles/staple/colors.scss

@@ -2,6 +2,7 @@ $primary-color: #3389dd;
 $complement-color: adjust_hue($primary-color, 180);
 $secondary-color: adjust_hue($primary-color, 135);
 $tertiary-color: adjust_hue($primary-color, 200);
+//&*append
 
 //AUTO GENERATE FOUNDATION COLORS: (CAN OVERRIDE)
 @import 'helpers/color_functions';

data/source/styles/staple/tables.scss

@@ -5,19 +5,7 @@ table{
 	//FIX SPACING
 	-webkit-border-horizontal-spacing: 0px;
 	-webkit-border-vertical-spacing: 0px;
-	//LINES
-	td, th{
-		padding: 8px;
-		border-bottom: 1px solid rgba($black, 0.1);
-	}
-	//STRIPE
-	tr:nth-child(even) {
-	   background-color: rgba($black, 0.03);
-	}
-	//HIGHLIGHT
-	tbody tr:hover{
-		background-color: rgba($black, 0.07);
-	}
+	//&*default
 }
 
 //BUILDERS

data/source/styles/staple/typography.scss

@@ -1,7 +1,7 @@
 //IMPORT FONTS HERE Typekit and Google Fonts
 @import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,700);
 @import url(http://fonts.googleapis.com/css?family=Roboto+Slab:400,300,700);
-@import url(http://fonts.googleapis.com/css?family=Inconsolata);
+@import url(http://fonts.googleapis.com/css?family=Inconsolata);//&*import
 
 //DEFAULTS
 $typeface-primary: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
@@ -10,6 +10,7 @@ $typeface-tertiary: "Inconsolata", monospace;
 $normal-font-weight: 400;
 $header-font-weight: 300;
 $subheader-font-weight: 400;
+//&*append
 
 //FOUNDATION STYLES: CAN BE OVERRIDDEN BUT NEEDED
 $font-family-sans-serif: $typeface-primary;

data/source/styles/tables/hilight.scss

@@ -0,0 +1,3 @@
+tbody tr:hover{
+	background-color: rgba($black, 0.07);
+}

data/source/styles/tables/horizontal-lines.scss

@@ -0,0 +1,4 @@
+td, th{
+	padding: 8px;
+	border-bottom: 1px solid rgba($black, 0.1);
+}

data/source/styles/tables/stripe.scss

@@ -0,0 +1,3 @@
+tr:nth-child(even) {
+   background-color: rgba($black, 0.03);
+}

data/source/styles/tables/themes/plastic.theme

@@ -0,0 +1,3 @@
+hilight
+horizontal-lines
+stripe

data/source/styles/typography/helvetica-neue.typeface

@@ -0,0 +1 @@
+"Helvetica Neue", Helvetica, Arial, sans-serif

data/source/styles/typography/roboto-import.scss

@@ -0,0 +1 @@
+@import url(http://fonts.googleapis.com/css?family=Roboto+Slab:400,300,700);

data/source/styles/typography/roboto.typeface

@@ -0,0 +1 @@
+"Roboto Slab", serif

data/source/styles/typography/themes/plastic.theme

@@ -0,0 +1,5 @@
+typeface-primary:roboto
+typeface-secondary:'"Inconsolata", monospace'
+typeface-tertiary:helvetica-neue
+normal-font-weight:200
+header-font-weight:600

data/staple.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "staple"
-  spec.version       = "0.4.1"
+  spec.version       = "0.4.2"
   spec.summary       = "Modular UI framework for rails built on top of foundation and sass"
   spec.description   = "a modular ui framework for rails built on top of foundation and sass."
   spec.authors       = ["Ryan Helsing"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: staple
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Ryan Helsing
@@ -80,9 +80,13 @@ files:
 - Rakefile
 - lib/staple.rb
 - lib/staple/buttons_generator.rb
+- lib/staple/colors_generator.rb
 - lib/staple/forms_generator.rb
 - lib/staple/install_generator.rb
+- lib/staple/reset_generator.rb
+- lib/staple/tables_generator.rb
 - lib/staple/theme_generator.rb
+- lib/staple/typography_generator.rb
 - source/simple_form/_form.html.slim
 - source/styles/buttons/big-bottom-border.scss
 - source/styles/buttons/border.scss
@@ -98,7 +102,7 @@ files:
 - source/styles/buttons/text-shadow.scss
 - source/styles/buttons/themes/plastic.theme
 - source/styles/buttons/transparent.scss
-- source/styles/colors/blue.scss
+- source/styles/colors/blue.color
 - source/styles/colors/themes/flatland.theme
 - source/styles/colors/themes/plastic.theme
 - source/styles/forms/2px-border-focus.scss
@@ -138,7 +142,14 @@ files:
 - source/styles/staple/tables.scss
 - source/styles/staple/typography.scss
 - source/styles/staple/utilities.scss
-- source/styles/typography/roboto.scss
+- source/styles/tables/hilight.scss
+- source/styles/tables/horizontal-lines.scss
+- source/styles/tables/stripe.scss
+- source/styles/tables/themes/plastic.theme
+- source/styles/typography/helvetica-neue.typeface
+- source/styles/typography/roboto-import.scss
+- source/styles/typography/roboto.typeface
+- source/styles/typography/themes/plastic.theme
 - staple.gemspec
 homepage: https://github.com/rhelsing/staple
 licenses:

data/source/styles/typography/roboto.scss

@@ -1,2 +0,0 @@
-//@import
-//font