spectra 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a72b5bc2f151b552d46a573dddbb482420ca601a
-  data.tar.gz: 657a78b5d037b17114d693826cc2d755c2678dff
+  metadata.gz: 7bfbb855908c014d2fb5bc287c3e3308a017749e
+  data.tar.gz: b54621293748e77c9b58218741de763508f08b22
 SHA512:
-  metadata.gz: b6d7832fe91453953e6f956716739af6f2fa70205a3221c27acb16e9526ea8e16cd8936896c1f8e2a3bda090bd533438a78c636c1cd636724be51a6980708d64
-  data.tar.gz: 27ab3a675820a9c4f8b0174fb88b463938494d14e8e860f320141d41638fd261b2042c5c06e18048ce940ba44109e8513ac23db725a94799dd1d3542a8462ddd
+  metadata.gz: 41b41b802b67693a38069e7bd63d3d50320411b60f1633a2fd8f8709aa30e8e4055b5ab81057a7639baec3af4ce43a7806d93442adc7ee9e10bc268d3da8ed16
+  data.tar.gz: 039eab67a118b693505d4d60e2ae1e27afcbf80c479a3b5301cc3c85da259453d6570f8b504abb72777f6c91487012de4aeee1b71f7646f64733c531434a0798

data/README.md

@@ -2,7 +2,7 @@ Spectra
 ========
 Keep app-specific colors in-sync across all your tools with a single specification!
 
-Spectra is a command-line utility and Ruby DSL that generates color palettes (.clr), Objective-C categories, and Swift extensions. Define a spectrum.rb file and then run spectra from the terminal. That's all there is to it.
+Spectra is a Ruby DSL for generating color palettes (.clr), Objective-C categories, and Swift extensions. Define a spectrum.rb file, run `spectra generate`, and your color files synchronize!
 
 ## Using the DSL: spectrum.rb
 
@@ -21,15 +21,15 @@ formats :palette, :swift
 format :objc, 'path/to/categories'
 
 ## if you want to customize the method/color names
-format :swift, 'path/to/extensions' do |name, prefix|
-  name.camelize(true) # SyntacticRogueRed
+format :swift, 'path/to/extensions' do |color, prefix|
+  color.name.camelize(true) + color.suffix # CoolBlue2
 end
 ```
 
-Specifying colors (optional, but it's pretty pointless not to):
+Specifying colors (*technically* optional, but hey...): 
 ```ruby
 color :red,    (components 255, 0, 130)
-color :gray,   (hex 0xEEEEEE 0.6)
+color :gray,   (hex 0xEEEEEE, 0.6)
 color :white,  (white 1.0)
 color :overlay (components 0.8, 0.7, 0.2, 0.75)
 
@@ -50,6 +50,6 @@ gem install spectra
 
 Or `bundler`:
 ```ruby
-gem 'spectra', '~> 0.1.1'
+gem 'spectra', '~> 0.1'
 ```
 

data/lib/spectra/commands.rb

@@ -7,10 +7,10 @@ module Spectra
 class Command < CLAide::Command 
  
   self.abstract_command = true
-  self.default_subcommand = 'generate'
 
   self.command = 'spectra'
   self.summary = 'Serializes colors into a variety of filetypes using a convenient ruby DSL'
+  self.version = VERSION
 
   def initialize(argv)
     Spectra.logger.parse_argv(argv)

data/lib/spectra/models/color.rb

@@ -5,13 +5,22 @@ module Spectra
 
   class Color
     
-    attr_accessor :name, :components
+    attr_accessor :name, :suffix, :components
    
     def initialize(name, components)
-      self.name = name
+      self.name, self.suffix = self.parse_name(name)
       self.components = components
     end 
 
+    def parse_name(name)
+      name_parts = name.to_s.split(/(\d+)/)
+      return name_parts.first, name_parts[1] || ''
+    end
+
+    ##
+    ## Forwarding
+    ##
+
     def respond_to?(name)
       super || Components.valid?(name)
     end

data/lib/spectra/template.rb

@@ -7,8 +7,8 @@ format :palette
 format :objc, 'path/to/categories'
 
 ## customize the name generation for a specific format
-# format :objc do |name, prefix|
-#   name.camelize(true)
+# format :objc do |color, prefix|
+#   color.name.camelize(true) + color.suffix
 # end
 
 ## specify the colors to generate 

data/lib/spectra/utilities.rb

@@ -90,7 +90,13 @@ end
 
 class Symbol  
   def camelize(pascal)
-    self.to_s.split('_').map.with_index do |component, index| 
+    self.to_s.camelize(pascal)  
+  end
+end
+
+class String
+  def camelize(pascal)
+    self.split('_').map.with_index do |component, index| 
       !pascal && index == 0 ? component : component.capitalize 
     end.join('') 
   end

data/lib/spectra/version.rb

@@ -1,3 +1,3 @@
 module Spectra
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/lib/spectra/views/objc_category.rb

@@ -45,7 +45,7 @@ module Spectra
     end
 
     def renamer
-      @renamer ||= lambda { |name, prefix| "#{prefix}_#{name.camelize(false)}Color" }
+      @renamer ||= lambda { |color, prefix| "#{prefix}_#{color.name.camelize(false)}Color#{color.suffix}" }
     end
     
     ##

data/lib/spectra/views/palette.rb

@@ -6,7 +6,7 @@ module Spectra
   class Palette < View
 
     def renamer
-      @renamer || lambda { |name, prefix| name.camelize(true) }
+      @renamer || lambda { |color, prefix| color.name.camelize(true) + color.suffix }
     end
 
     ##

data/lib/spectra/views/swift_extension.rb

@@ -6,7 +6,7 @@ module Spectra
   class SwiftExtension < View
     
     def renamer
-      @renamer || lambda { |name, prefix| name.camelize(true) } 
+      @renamer || lambda { |color, prefix| color.name.camelize(true) + color.suffix } 
     end 
 
     ##

data/lib/spectra/views/view.rb

@@ -49,8 +49,8 @@ module Spectra
       end
     end
 
-    def format_color_name(name)
-      self.renamer.call(name, self.prefix)
+    def format_color_name(color)
+      self.renamer.call(color, self.prefix)
     end
 
     def format_color_value(value)
@@ -93,7 +93,7 @@ module Spectra
     ##
 
     def name
-      self.format(:name, self.color.name)
+      self.format(:name, self.color)
     end
 
     def grayscale?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spectra
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Ty Cobb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler