yuml 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dfedd4143fa7f70413f2121222c644e571ab0ce
-  data.tar.gz: 2aca47371b0fcb0fd79c36fca51eefa21168d987
+  metadata.gz: 907906ac9ee46b88eba7d9f9b1a257d7447bd1e4
+  data.tar.gz: 43fa6090d14dd0e37d339e5618f206a1c59e3876
 SHA512:
-  metadata.gz: e4004dfaa42b37baa7461041eb00065863a78b30b70915a8772a8828648a96b0e433fbd85556431cb9d9b108b1210f88180359d2b6d78ea77ed8cab4380e959f
-  data.tar.gz: 563158e7cefff93a7ff4e4ca4c13adf9e3751f6f7274ba4d336d9fd4bef7615b0102a5a4fdabaaa79b281ed6f3ae5b553cf1b64932b9350688f45ede3634c036
+  metadata.gz: 5888e4a2b4bc5c8e2cd76eaeedcf47f99f61b8dbea44841dc2426b7dd6df0295f8db06b6e7d63f0d4374c0ece61b9685abd2b3c5e1e9dd0fd9e18f847a2b63ad
+  data.tar.gz: 3a16c0f33d778d1033988bef97ee4bfb64df70ec07ec667fbcd1c1220143be52b97b3747361fc1ee9bd2fa736b85d606fc6a175a6d3bc527ab773f774bff699b

data/lib/yuml.rb

@@ -3,16 +3,16 @@ require 'net/http'
 require 'yuml/class'
 require 'yuml/relationship'
 
+# A module to create a DSL for yuml.me
 module YUML
   extend self
 
   ESCAPE_CHARACTERS = {
     '{' => "\u23A8",
-    '}' => "\u23AC"
+    '}' => "\u23AC",
+    ',' => "\u201A"
   }
 
-  ESCAPE_COMMA = "\u201A"
-
   def generate(options)
     options = { file: '/tmp/yuml.pdf' }.merge(options)
     classes.clear
@@ -47,6 +47,6 @@ module YUML
   end
 
   def encodings
-    "#{ESCAPE_CHARACTERS.values.join}#{ESCAPE_COMMA}[](){}+->|,=;*^ "
+    "#{ESCAPE_CHARACTERS.values.join}[](){}+->|.,=;*^ "
   end
 end

data/lib/yuml/class.rb

@@ -14,30 +14,27 @@ module YUML
       @name
     end
 
-    def public_methods(*args)
-      uml_methods('+', *args)
+    def variables(*args)
+      args.flatten!
+      return attributes(@variables) if args.empty?
+      @variables << normalize(args)
     end
 
-    def private_methods(*args)
-      uml_methods('-', *args)
-    end
-
-    def public_variables(*args)
-      uml_variables('+', *args)
-    end
-
-    def private_variables(*args)
-      uml_variables('-', *args)
+    def methods(*args)
+      args.flatten!
+      return attributes(@methods) if args.empty?
+      @methods << normalize(args)
     end
 
     def has_a(dest, options = {})
-      relationship = YUML::Relationship.relationship(options)
+      options[:type] = :aggregation unless %i(composition aggregation).include?(options[:type])
+      relationship = YUML::Relationship.send(options[:type], options[:cardinality])
       @relationships << "[#{name}]#{relationship}[#{dest.name}]"
     end
 
     def is_a(dest, options = {})
       options[:type] = :inheritance unless %i(inheritance interface).include?(options[:type])
-      relationship = YUML::Relationship.relationship(options)
+      relationship = YUML::Relationship.send(options[:type])
       @relationships << "[#{dest.name}]#{relationship}[#{name}]"
     end
 
@@ -53,50 +50,11 @@ module YUML
 
     def normalize(values)
       values.map(&:to_s).map do |v|
-        YUML::ESCAPE_CHARACTERS.each do |char, escape|
-          v.tr!(char, escape)
-        end
+        YUML::ESCAPE_CHARACTERS.each { |char, escape| v.tr!(char, escape) }
         v
-      end.join("\u201A ")
-    end
-
-    def uml_variables(scope, *args)
-      args.each { |var| variable(scope: scope, attribute: var) }
-    end
-
-    def uml_methods(scope, *args)
-      args.each do |m|
-        if m.class == Hash
-          mets = m.map { |k, v| "#{k}(#{normalize(v)})" }
-          mets.each { |met| method(scope: scope, attribute: met) }
-        else
-          method(scope: scope, attribute: "#{m}()")
-        end
       end
     end
 
-    def method(options)
-      attribute(@methods, options)
-    end
-
-    def variable(options)
-      attribute(@variables, options)
-    end
-
-    def attribute(attributes, options)
-      scope = options[:scope] || '+'
-      scope = '+' unless %w(+ -).include?(scope)
-      attributes << "#{scope}#{options.fetch(:attribute)}"
-    end
-
-    def methods
-      attributes(@methods)
-    end
-
-    def variables
-      attributes(@variables)
-    end
-
     def attributes(attrs)
       "|#{attrs.join(';')}" unless attrs.empty?
     end

data/lib/yuml/relationship.rb

@@ -1,43 +1,29 @@
-# Represents a yUML relationship
 module YUML
+  # Represents UML class relationships
   module Relationship
-    extend self
+    module_function
 
-    def relationship(options)
-      options = { type: :aggregation }.merge(options)
-      types = %i(aggregation composition inheritance interface)
-      type = options[:type]
-      type = :aggregation unless types.include?(type)
-      cardinality = options[:cardinality]
-      representation(type, cardinality)
+    def inheritance
+      '^-'
     end
 
-    private
+    def interface
+      '^-.-'
+    end
 
-    def representation(type, cardinality)
-      if %i(aggregation composition).include?(type)
-        return composition(type, cardinality)
-      elsif %i(inheritance interface).include?(type)
-        return inheritance(type)
-      end
+    def composition(*args)
+      "+#{aggregation(*args)}"
     end
 
-    def composition(type, cardinality)
-      base = '+'
-      base << '+' if type == :composition
-      if cardinality.nil?
-        base << '->'
-      elsif cardinality.class == Array && cardinality.length == 2
-        base << "#{cardinality[0]}-#{cardinality[1]}>"
+    def aggregation(*args)
+      args.flatten!
+      if args.size == 2
+        "+#{args[0]}-#{args[1]}>"
+      elsif args.size == 1
+        "+-#{args.first}>"
       else
-        base << "-#{cardinality}>"
+        '+->'
       end
-      base
-    end
-
-    def inheritance(type)
-      return '^-.-' if type == :interface
-      '^-'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yuml
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Derek Stride
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-13 00:00:00.000000000 Z
+date: 2016-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec