blueprint-generators-rails 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4d40ad0220410179bc7e2a78cfc606478c6a022
-  data.tar.gz: 60333b9d3512a99f9454a43ff5e926f697431d3f
+  metadata.gz: 95a1f4cef6d1d5f906de05fa614e527627f0c340
+  data.tar.gz: c20b7ede3ce1599b42f8cb27f8b8534bd515ae44
 SHA512:
-  metadata.gz: 3f46b96de8a46493af635b4d01bec24095a136bd84364f0dcaf344d9dd3f8a95d87f42c5d7327eff705e0a8b55335a281c097ce1d6e169eaf843685e363e4b62
-  data.tar.gz: 8a6a1492e30b871ae2d8e881c20f0c14fe00aa4d74b26f24c721e506bd173bf5a840a87b809fabd4c10f44607ed6d06fc8027b5fe3c3c44c0a3c745cccf8c922
+  metadata.gz: 7eb4b734287df247204e41968a89bad29752fac86b11537504b186a1f9676639c861a797186b9e346769ccc57fc83c3e5e88c6cdb3311b122f033c0bcd98c6dc
+  data.tar.gz: 34c15cd295910813656024f3b586f102fe2255847ab25c335748f89928819445c51f7440b4a85574448ccdb511e0ae85c6c71dd11cf705c958a98833db3e01c7

data/bin/setup

@@ -4,4 +4,4 @@ IFS=$'\n\t'
 
 bundle install
 
-# Do any other automated setup that you need to do here
+# Do any other automated setup that you need to do here

data/lib/blueprint/generators/rails/version.rb

@@ -1,7 +1,7 @@
 module Blueprint
   module Generators
     module Rails
-      VERSION = "0.1.8"
+      VERSION = "0.1.9"
     end
   end
 end

data/lib/tasks/blueprint.rake

@@ -100,7 +100,6 @@ namespace :blueprint do
             end
 
             # search for a 'has_one' or 'belongs_to' declaration
-            # TODO this would find '->' symbols: (has_one) :([^,#\s]+),[\s]*->[\s]*{(.*)}
             a, has_one_clazz = line.match(/(has_one|belongs_to) :([^,#\s]+)/).try(:captures)
             unless has_one_clazz.nil?
               has_one_name = has_one_clazz.classify.singularize.strip
@@ -113,13 +112,31 @@ namespace :blueprint do
             end
 
             # search for a 'has_many' declaration
-            # TODO this would find '->' symbols: (has_many) :([^,#\s]+),[\s]*->[\s]*{(.*)}
-            b, has_many_clazz = line.match(/(has_many) :([^,#\s]+)/).try(:captures)
-            unless has_many_clazz.nil?
-              has_many_name = has_many_clazz.classify.pluralize.strip
+            b, has_many_symbol = line.match(/(has_many) :([^,#\s]+)/).try(:captures)
+            unless has_many_symbol.nil?
+              has_many_name = has_many_symbol.classify.pluralize.strip
+
+              # if this declaration has a class name then make sure that we use it in our model
+              explicit_class_name = line.match(/class_name:[\s]*'(.*)'[,]?/).try(:captures)
+              where_clause = line.match(/(where)/).try(:captures)
+
+              # we behave in one of two ways here (just like Rails)
+              # if there is an explicit class name defined then use that as the model name, otherwise use the has many symbol
+              # also, in the case of an explicit class name being declared, look for a 'where' clause (if we find one then
+              # use the has many symbole as the name of the subset that is being defined)
 
               # add the node relationship to the concept
-              model[concept_name].push({ :type => 'has many', :name => has_many_name })
+              if explicit_class_name.nil? || explicit_class_name.empty?
+                model[concept_name].push({ :type => 'has many', :name => has_many_name })
+              else
+                # puts explicit_class_name.inspect
+                if where_clause.nil? || where_clause.empty?
+                  model[concept_name].push({ :type => 'has many', :name => explicit_class_name.first.pluralize })
+                else
+                  model[concept_name].push({ :type => 'has many', :name => explicit_class_name.first.pluralize,
+                                             :condition => has_many_symbol.capitalize.pluralize })
+                end
+              end
 
               print_debug step_count, "Concept " + concept_name + " has one " + has_many_name
               step_count += 1
@@ -167,7 +184,11 @@ namespace :blueprint do
           when 'has one'
             pogo << "  has one \"" + r[:name] + "\"\n"
           when 'has many'
-            pogo << "  has many \"" + r[:name] + "\"\n"
+            if r.has_key?(:condition) && !r[:condition].nil?
+              pogo << "  has many \"" + r[:name] + "\" that are \"" + r[:condition] + "\"\n"
+            else
+              pogo << "  has many \"" + r[:name] + "\"\n"
+            end
           else
             # TODO implement
         end
@@ -176,7 +197,7 @@ namespace :blueprint do
 
     # output the result
     puts ''
-    puts 'Navigate to the link below and paste the provided script into the editor'
+    puts 'Navigate to the link below and paste the provided script into the editor found at:'
     puts ''
     puts '        http://anaxim.io/scratchpad/'
     puts ''

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blueprint-generators-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - benjii
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler