css-native 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb41e593fc373779c07707c9877b3c8edcfef509c3e5ba993e89efe90ed5ce6b
-  data.tar.gz: 2fffc3afef1ec477c2495ae7a72f5dbcc5988502d89fb2d15416ef63318e9c17
+  metadata.gz: ae9462bf9fa2a0a6cfa29fa16ae8861b6659b64dbb713ad470c566e54509650d
+  data.tar.gz: 32a3e75aa1627e93343c54ecd0ea278845d9311bfe0c9cf1bc2388dbcd82c8c9
 SHA512:
-  metadata.gz: 9d76de8661a17d3b350e7360828d2ad734c046c1e85d16d2fefd0ac294e6c11b2acfcd2486cdfa431f5fbb7d9b80b843dee38779eb395f3db04dad6421f656a7
-  data.tar.gz: 7142da4d6b9d7c146fc9bb8239df2c1d6c76b77d240b49d8888f9791f0d7de9a8cb3ca537f7525224920e215b16976e916e0fc7ba049830e10a98e61bfefb97b
+  metadata.gz: b52d3b1168e8efba6901b0debe41460a7baf46d0e0e10c3562fc8d730b491c455d0e6a3c91e0c545c5285b1c53b36e8d7013debe07f072e57a70f8e4a70f2ecb
+  data.tar.gz: 06af858d36aab5b99983c3d13cb2db99b970462714813f3171221f9192300ebae550c4c178df21c14235008ddf6c3ee76a4c910706e43f8ff3df556c45c50141

data/lib/css-native.rb

@@ -9,6 +9,10 @@ class CSSNative
     sheet
   end
   
+  def self.format_element(name)
+    name.to_s
+  end
+
   def self.format_class(name)
     ".#{name}"
   end
@@ -37,6 +41,10 @@ class CSSNative
     @rules = []
   end
 
+  def element(name)
+    Rule.new(self).with_element(name)
+  end
+
   alias_method :klass, :class
   def class(name = nil)
     if name.nil?

data/lib/css-native/rule.rb

@@ -5,59 +5,42 @@ class CSSNative
       @previous = previous
       @parent = parent
       @selector = name.to_s
-      @body = {}
       @stylesheet = Stylesheet.new(self)
     end
 
     # basic selectors
+    def with_element(name, &block)
+      raise GrammarError.new(name) if previous_selector?
+      @previous = :element
+      @selector += CSSNative::format_element(name)
+      chain(&block)
+    end
+
     def with_class(name, &block)
-      s = CSSNative::format_class(name)
       @previous = :class
-      @selector += s
-      if block_given?
-        @stylesheet.instance_exec(@stylesheet, &block)
-        @parent.rules << to_s
-      else
-        self
-      end
+      @selector += CSSNative::format_class(name)
+      chain(&block)
     end
 
     def with_id(name, &block)
-      s = CSSNative::format_id(name)
       @previous = :id
-      @selector += s
-      if block_given?
-        @stylesheet.instance_exec(@stylesheet, &block)
-        @parent.rules << to_s
-      else
-        self
-      end
+      @selector += CSSNative::format_id(name)
+      chain(&block)
     end
 
     def with_attribute(name, operation = :none, value = nil, case_sensitive: true, &block)
-      s = CSSNative::format_attribute(name, operation, value, case_sensitive: case_sensitive)
-      @previous = :attr
-      @selector += s
-      if block_given?
-        @stylesheet.instance_exec(@stylesheet, &block)
-        @parent.rules << to_s
-      else
-        self
-      end
+      @previous = :attribute
+      @selector += CSSNative::format_attribute(name, operation, value, case_sensitive: case_sensitive)
+      chain(&block)
     end
 
     def with(name, *args, type: :element, &block)
       case type
       when :element
-        name = (name == :all ? "*" : name.to_s)
-        raise GrammarError.new(name) if previous_selector?
-        @previous = (name == :all ? :all : :element)
-        @selector += name
-        if block_given?
-          @stylesheet.instance_exec(@stylesheet, &block)
-          @parent.rules << to_s
+        if name == :all
+          all(&block)
         else
-          self
+          with_element(name, &block)
         end
       when :class
         with_class(name, &block)
@@ -75,12 +58,7 @@ class CSSNative
       raise GrammarError.new("*") if previous_selector?
       @previous = :all
       @selector += "*"
-      if block_given?
-        @stylesheet.instance_exec(@stylesheet, &block)
-        @parent.rules << to_s
-      else
-        self
-      end
+      chain(&block)
     end
 
     # Grouping selectors
@@ -107,7 +85,7 @@ class CSSNative
 
     def combinator(c)
       m = c.to_sym
-      raise GrammarError.new(COMBINATORS[]) if previous_combinator?
+      raise GrammarError.new(COMBINATORS[m]) if previous_combinator?
       @previous = :combinator
       @selector += COMBINATORS[m]
       self
@@ -179,19 +157,17 @@ class CSSNative
       pc = name.to_s.gsub("_", "-")
       m = name.to_s.gsub("-", "_").to_sym
       raise PseudoClassError.new(method: pc) unless PSEUDO_CLASSES.key?(m)
-      arg_defs = PSEUDO_CLASSES[m]
-      @previous = :pseudo_class
-      args.all? do |arg|
-        raise PseudoClassError.new(argument: arg, method: pc) unless matches_arg_defs?(arg_defs, arg.to_s)
+
+      args.each? do |arg|
+        unless matches_arg_defs?(PSEUDO_CLASSES[m], arg.to_s)
+          raise PseudoClassError.new(argument: arg, method: pc)
+        end
       end
-      @selector += ":" + pc
+      
+      @previous = :pseudo_class
+      @selector += ":#{pc}"
       @selector += "(#{args.join(" ")})" unless args.empty?
-      if block_given?
-        @stylesheet.instance_exec(@stylesheet, &block)
-        @parent.rules << to_s
-      else
-        self
-      end
+      chain(&block)
     end
 
     # pseudo-elements
@@ -219,19 +195,17 @@ class CSSNative
       pe = name.to_s.gsub("_", "-")
       m = name.to_s.gsub("-", "_").to_sym
       raise PseudoElementError.new(method: pe) unless PSEUDO_ELEMENTS.key?(m)
-      arg_defs = PSEUDO_ELEMENTS[m]
-      @previous = :pseudo_element
-      args.all? do |arg|
-        raise PseudoElementError.new(argument: arg, method: ps) unless matches_arg_defs?(arg_defs, arg.to_s) 
+     
+      args.each? do |arg|
+        unless matches_arg_defs?(PSEUDO_ELEMENTS[m], arg.to_s)
+          raise PseudoElementError.new(argument: arg, method: pe)
+        end
       end
-      @selector += "::" + pe
+      
+      @previous = :pseudo_element
+      @selector += "::#{pe}"
       @selector += "(#{args.join(" ")})" unless args.empty?
-      if block_given?
-        @stylesheet.instance_exec(@stylesheet, &block)
-        @parent.rules << to_s
-      else
-        self
-      end 
+      chain(&block)
     end
 
     def method_missing(m, *args, &block)
@@ -271,13 +245,22 @@ class CSSNative
       previous?(:element, :class, :id, :attribute, :all, :pseudo_class, :pseudo_element)
     end
 
+    # If a block is given, executes that as a stylesheet. Otherwise, returns self to 
+    # facilitate chaining
+    def chain(&block)
+      if block_given?
+        @stylesheet.instance_exec(@stylesheet, &block)
+        @parent.rules << to_s 
+      else  
+        self
+      end
+    end
+
     def matches_arg_defs?(defs, arg)
       if defs.nil?
         arg.nil?
-      elsif defs.empty?
-        true
       else
-        defs.any? {|d| d === arg}
+        defs.empty? || defs.any? {|d| d === arg}
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: css-native
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Kellen Watt