sdl 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6e61a1d5604a66b42b6fb6c1d9ef23cafe16f82
-  data.tar.gz: 9c0aed1be31e2fd105bdf4797aae965a2470c9cf
+  metadata.gz: f3c0c72e2ceb5b542143447458c5428edf813ae3
+  data.tar.gz: 74287f31894980163d4f623578f72ded367dc480
 SHA512:
-  metadata.gz: c507bebf2605c7dd156219e5ec791660279daf1de15d05cdffcbe5ed2142888c62b657033d6c2b7015565a4824cf5d5282df8919f63169559e9d9d5965c7ddbc
-  data.tar.gz: 3f0982e9b1785c24a7a5f619bdaa7910f9559310a31008157a9043b2a4dce68172c21b01f4da11992e4022bbb3f711c9feac54ef4ad584cc8cf42bddc9e46375
+  metadata.gz: 9fb06fcea7e7cb5c7eaa711d3c57269508257246afbb7e9eee6c73bfdfb1159c4d30bb3858ced2c50bd3f6fd0ecfbd2fb5d4016c0d9829cbdc28c3709c875b32
+  data.tar.gz: 83bec3ca9b3c0d44aaf4cd82b3fafb1425e18c04637463deb0645b476729570f9deee94d338a97a892023041fb0f30fffa738aef4e4cbcc911fb67546e206224

data/lib/sdl/field.rb

@@ -18,6 +18,24 @@ module SDL
       @options = options
     end
 
+    # Indicates that this is an {Attribute}
+    # @return [Boolean]
+    def attribute?
+      !enum? && !association? && !attachment?
+    end
+
+    # Indicates that this is an {Attachment}
+    # @return [Boolean]
+    def attachment?
+      has_one_attached? || has_many_attached?
+    end
+
+    # Indicates that this is an {Association}
+    # @return [Boolean]
+    def association?
+      has_one? || has_many? || belongs_to?
+    end
+
     # @!method id?
     #   Indicates that this is an {Attribute} whose type is `:id`
     #   @return [Boolean]

data/lib/sdl/model.rb

@@ -1,4 +1,3 @@
-require "sdl/fields"
 require "sdl/attribute"
 require "sdl/enum"
 require "sdl/association"
@@ -10,6 +9,10 @@ module SDL
     # @return [String]
     attr_reader :name
 
+    # All of the fields that have been registered
+    # @return [Array<Field>]
+    attr_reader :fields
+
     # Any additional options
     # @return [Hash]
     attr_reader :options
@@ -22,12 +25,6 @@ module SDL
       instance_eval(&block) if block_given?
     end
 
-    # All of the fields that have been registered
-    # @return [Fields]
-    def fields
-      Fields.new(@fields)
-    end
-
     # Adds an {Attribute} to the model
     # @param name [Symbol]
     # @param type [Symbol]
@@ -134,5 +131,77 @@ module SDL
       attribute :created_at, :datetime, required: true
       attribute :updated_at, :datetime, required: true
     end
+
+    # Get all {Attribute} fields
+    # @return [Array<Attribute>]
+    def attribute_fields
+      fields.grep Attribute
+    end
+
+    # Get all {Association} fields
+    # @return [Array<Association>]
+    def association_fields
+      fields.grep Association
+    end
+
+    # Get all {Attachment} fields
+    # @return [Array<Attachment>]
+    def attachment_fields
+      fields.grep Attachment
+    end
+
+    # @!method id_fields
+    #   Get all {Attribute} fields whose type is `:id`
+    #   @return [Array<Attribute>]
+    # @!method string_fields
+    #   Get all {Attribute} fields whose type is `:string`
+    #   @return [Array<Attribute>]
+    # @!method boolean_fields
+    #   Get all {Attribute} fields whose type is `:boolean`
+    #   @return [Array<Attribute>]
+    # @!method integer_fields
+    #   Get all {Attribute} fields whose type is `:integer`
+    #   @return [Array<Attribute>]
+    # @!method float_fields
+    #   Get all {Attribute} fields whose type is `:float`
+    #   @return [Array<Attribute>]
+    # @!method decimal_fields
+    #   Get all {Attribute} fields whose type is `:decimal`
+    #   @return [Array<Attribute>]
+    # @!method date_fields
+    #   Get all {Attribute} fields whose type is `:date`
+    #   @return [Array<Attribute>]
+    # @!method datetime_fields
+    #   Get all {Attribute} fields whose type is `:datetime`
+    #   @return [Array<Attribute>]
+    # @!method text_fields
+    #   Get all {Attribute} fields whose type is `:text`
+    #   @return [Array<Attribute>]
+    # @!method binary_fields
+    #   Get all {Attribute} fields whose type is `:binary`
+    #   @return [Array<Attribute>]
+    # @!method enum_fields
+    #   Get all {Enum} fields
+    #   @return [Array<Enum>]
+    # @!method belongs_to_fields
+    #   Get all {Association::BelongsTo} fields
+    #   @return [Array<Association::BelongsTo>]
+    # @!method has_one_fields
+    #   Get all {Association::HasOne} fields
+    #   @return [Array<Assocation::HasOne>]
+    # @!method has_many_fields
+    #   Get all {Association::HasMany} fields
+    #   @return [Array<Association::HasMany>]
+    # @!method has_one_attached_fields
+    #   Get all {Attachment::HasOne} fields
+    #   @return [Array<Attachment::HasOne>]
+    # @!method has_many_attached_fields
+    #   Get all {Attachment::HasMany} fields
+    #   @return [Array<Attachment::HasMany>]
+    TYPES.each do |meth|
+      define_method "#{meth}_fields" do
+        fields.select { |field| field.type == meth }
+      end
+    end
   end
 end

data/lib/sdl/schema.rb

@@ -37,7 +37,7 @@ module SDL
     def depsort!
       each_node = models.method(:each)
       each_child = lambda do |model, &block|
-        belongs_to = model.fields.belongs_to.map(&:model_name)
+        belongs_to = model.belongs_to_fields.map(&:model_name)
         children = models.select { |m| belongs_to.include?(m.name) }
         children.each(&block)
       end

data/lib/sdl/version.rb

@@ -1,3 +1,3 @@
 module SDL
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sdl
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ray Zane
@@ -104,7 +104,6 @@ files:
 - lib/sdl/attribute.rb
 - lib/sdl/enum.rb
 - lib/sdl/field.rb
-- lib/sdl/fields.rb
 - lib/sdl/model.rb
 - lib/sdl/parser.rb
 - lib/sdl/schema.rb

data/lib/sdl/fields.rb

@@ -1,103 +0,0 @@
-require "sdl/types"
-require "sdl/field"
-require "sdl/attribute"
-require "sdl/enum"
-require "sdl/association"
-require "sdl/attachment"
-
-module SDL
-  # All fields of a {Model}
-  class Fields
-    include Enumerable
-
-    # @api private
-    def initialize(fields)
-      @fields = fields
-    end
-
-    # Get a field by index
-    # @param index [Integer]
-    # @return [Field,nil]
-    def [](index)
-      @fields[index]
-    end
-
-    # Iterate over all fields
-    # @yield [Field]
-    def each(&block)
-      @fields.each(&block)
-    end
-
-    # Get all instances of {Attribute}
-    # @return [Array<Attribute>]
-    def attributes
-      grep Attribute
-    end
-
-    # Get all instances of {Association}
-    # @return [Array<Association>]
-    def associations
-      grep Association
-    end
-
-    # Get all instances of {Attachment}
-    # @return [Array<Attachment>]
-    def attachments
-      grep Attachment
-    end
-
-    # @!method id
-    #   Get all instances of {Attribute} whose type is `:id`
-    #   @return [Array<Attribute>]
-    # @!method string
-    #   Get all instances of {Attribute} whose type is `:string`
-    #   @return [Array<Attribute>]
-    # @!method boolean
-    #   Get all instances of {Attribute} whose type is `:boolean`
-    #   @return [Array<Attribute>]
-    # @!method integer
-    #   Get all instances of {Attribute} whose type is `:integer`
-    #   @return [Array<Attribute>]
-    # @!method float
-    #   Get all instances of {Attribute} whose type is `:float`
-    #   @return [Array<Attribute>]
-    # @!method decimal
-    #   Get all instances of {Attribute} whose type is `:decimal`
-    #   @return [Array<Attribute>]
-    # @!method date
-    #   Get all instances of {Attribute} whose type is `:date`
-    #   @return [Array<Attribute>]
-    # @!method datetime
-    #   Get all instances of {Attribute} whose type is `:datetime`
-    #   @return [Array<Attribute>]
-    # @!method text
-    #   Get all instances of {Attribute} whose type is `:text`
-    #   @return [Array<Attribute>]
-    # @!method binary
-    #   Get all instances of {Attribute} whose type is `:binary`
-    #   @return [Array<Attribute>]
-    # @!method enum
-    #   Get all instances of {Enum}
-    #   @return [Array<Enum>]
-    # @!method belongs_to
-    #   Get all instances of {Association::BelongsTo}
-    #   @return [Array<Association::BelongsTo>]
-    # @!method has_one
-    #   Get all instances of {Association::HasOne}
-    #   @return [Array<Assocation::HasOne>]
-    # @!method has_many
-    #   Get all instances of {Association::HasMany}
-    #   @return [Array<Association::HasMany>]
-    # @!method has_one_attached
-    #   Indicates that this is an {Attachment::HasOne}
-    #   @return [Array<Attachment::HasOne>]
-    # @!method has_many_attached
-    #   Indicates that this is an {Attachment::HasMany}
-    #   @return [Array<Attachment::HasMany>]
-    TYPES.each do |meth|
-      define_method meth do
-        select { |field| field.type == meth }
-      end
-    end
-  end
-end