yuml 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3f9891582d589bd54d921e4e9f809917166af7a
-  data.tar.gz: 5e9ab82dbe3e0a8921f065423a8e638081eaffcb
+  metadata.gz: fb41458dc9a3f53d8ae9b6a381568b055141c872
+  data.tar.gz: 262dbe5b8793ff75236f522031bfec68ca98b84d
 SHA512:
-  metadata.gz: 57ea65c7173f929768e0b0b5fec44fabc08a5bbe6bf4ff59b7762fbb767a0cec5f093f77f9c50cfbd56eb44439be3354ea15fd64c1fcb9314e0c73b47c6e6055
-  data.tar.gz: f2461b929fe84828c5dff19633f143c15d0b213b98eda120538e7f64ef5851d0cb8e0baea1cc7345dd825952c1bf5ff1c1603437d847eea29d8316090b4e7577
+  metadata.gz: 2a228132174120d63b81dea482872fae748a7f6475f13e1a383f3c3704cd479836012862655be2a2f43802b11bb044bcc45000efbdc6ce36f695710ae3b003c2
+  data.tar.gz: 5b72d09f11ca6ac00de264f523b776aa0ffb0d1b092dfe6137b826e176d27e71ad02f9acbc1b0ae23a01735358b502719c65f8d6ae12064f327c7b25a29ba00f

data/lib/yuml.rb

@@ -54,11 +54,16 @@ module YUML
   end
 
   def fetch_uml(file)
-    uri = URI("https://yuml.me/diagram/class/#{yuml}.pdf")
+    uri = URI("https://yuml.me/diagram/class/#{yuml}#{extname(file)}")
     response = Net::HTTP.get_response(uri)
     File.write(file, response.body)
   end
 
+  def extname(filename)
+    return '.pdf' unless %w(.pdf .png .jpg .jpeg).include?(File.extname(filename))
+    File.extname(filename).sub('.jpg', '.jpeg')
+  end
+
   def encodings
     "#{ESCAPE_CHARACTERS.values.join}[](){}+->|.,=;*^ "
   end

data/lib/yuml/class.rb

@@ -33,7 +33,8 @@ module YUML
       @methods << normalize(args)
     end
 
-    def has_a(dest, type: :aggregation, cardinality: nil)
+    def has_a(dest, type: :aggregation, cardinality: nil, association_name: cardinality)
+      cardinality ||= association_name
       type = :aggregation unless %i(composition aggregation).include?(type)
       relationship = YUML::Relationship.send(type, cardinality)
       @relationships << "[#{name}]#{relationship}[#{dest.name}]"
@@ -45,7 +46,8 @@ module YUML
       @relationships << "[#{dest.name}]#{relationship}[#{name}]"
     end
 
-    def associated_with(dest, type: :directed_assoication, cardinality: nil)
+    def associated_with(dest, type: :directed_assoication, cardinality: nil, association_name: cardinality)
+      cardinality ||= association_name
       type = :directed_assoication unless %i(
         association directed_assoication two_way_association dependency
       ).include?(type)

data/spec/yuml_class_spec.rb

@@ -95,6 +95,11 @@ describe YUML::Class do
       expect(@doc.relationships).to eq '[Document]+-*>[Picture]'
     end
 
+    it 'aliases cardinality to association_name' do
+      @doc.has_a(@pic, association_name: 'profilePhoto')
+      expect(@doc.relationships).to eq '[Document]+-profilePhoto>[Picture]'
+    end
+
     it 'should handle composition and cardinality' do
       @doc.has_a(@pic, type: :composition, cardinality: [0, '*'])
       expect(@doc.relationships).to eq '[Document]++0-*>[Picture]'
@@ -127,6 +132,11 @@ describe YUML::Class do
       expect(@doc.relationships).to eq '[Document]uses-used>[Picture]'
     end
 
+    it 'aliases cardinality to association_name' do
+      @doc.has_a(@pic, association_name: 'profilePhoto')
+      expect(@doc.relationships).to eq '[Document]+-profilePhoto>[Picture]'
+    end
+
     it 'should handle a bi directional associations with cardinality' do
       @doc.associated_with(@pic, type: :two_way_association, cardinality: ['used by'])
       expect(@doc.relationships).to eq '[Document]<-used by>[Picture]'

data/spec/yuml_spec.rb

@@ -45,7 +45,7 @@ describe YUML do
     end
 
     before :each do
-      @stub = stub_request(:any, %r{http://yuml.me/.*}).to_return(body: 'abc', status: 200)
+      @stub = stub_request(:any, %r{https://yuml.me/.*}).to_return(body: 'abc', status: 200)
     end
 
     it 'should yield the block' do
@@ -70,6 +70,14 @@ describe YUML do
       expect(File.exist?(@options[:file])).to be true
       expect(File.read(@options[:file])).to eq 'abc'
     end
+
+    it 'should add a valid filetype if an invalid on is specified' do
+      stub = stub_request(:any, %r{https://yuml.me/.*.pdf}).to_return(body: 'abc', status: 200)
+      YUML.generate(file: 'invalid.jjj') do |uml|
+        uml.class { name 'Document' }
+      end
+      expect(stub).to have_been_requested
+    end
   end
 
   describe '#attach_note' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yuml
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Derek Stride