mobiorm_client 1.0.3 → 1.0.4

data/bin/mobiorm

@@ -1,6 +1,9 @@
 #!/usr/bin/env ruby
 
 require 'mobiorm'
+
+@platform = "objectivec"
+
 ARGV.each do |arg|
     if arg =~ /^mode=(vertabelo|xml)$/
         @mode = "#{$1}"
@@ -18,6 +21,10 @@ ARGV.each do |arg|
         @id = "#{$1}"
     elsif arg =~ /^tag=(.+)$/
         @tag = "#{$1}"
+    elsif arg =~ /^package=(.+)$/
+        @package = "#{$1}"
+    elsif arg =~ /^platform=(android|objectivec)$/
+        @platform = "#{$1}"
     else 
         next
     end
@@ -36,7 +43,7 @@ if @mode == "xml"
     elsif not File.exists? @xml
     	puts "File given in \"file\" argument does not exist: " + @xml + "."
     else
-    	Mobiorm.getOrmFromFile(@dest, @xml, @classPrefix, @propertyPrefix)
+    	Mobiorm.getOrmFromFile(@dest, @platform, @xml, @classPrefix, @propertyPrefix, @package)
     end
 elsif @mode == "vertabelo"
     if not @token
@@ -44,7 +51,7 @@ elsif @mode == "vertabelo"
     elsif not @id
     	puts "For \"vertabelo\" mode, \"model\" argument is required and it has to be your model identifier."
     else
-    	Mobiorm.getOrmFromVertabelo(@dest, @token, @id, @tag, @classPrefix, @propertyPrefix);
+    	Mobiorm.getOrmFromVertabelo(@dest, @platform, @token, @id, @tag, @classPrefix, @propertyPrefix, @package);
     end
 end
 

data/lib/mobiorm.rb

@@ -8,7 +8,7 @@ require "base64"
 class Mobiorm
 
     MOBIORM_VERSION = "1.0"
-    HTTP_SERVICE = "https://api.mobiorm.com/" + MOBIORM_VERSION + "/generate/objectivec"
+    HTTP_SERVICE = "https://api-mobile-orm.vertabelo.com/" + MOBIORM_VERSION + "/generate/"
     VERTABELO_API_XML = "https://my.vertabelo.com/api/xml/"
         
     def self.downloadModel(token, id, tag)
@@ -23,19 +23,25 @@ class Mobiorm
         }
     end
 
-    def self.generateOrm(file, classPrefix, propertyPrefix)
+    def self.generateOrm(file, platform, classPrefix, propertyPrefix, package)
         parameters = Hash.new
         parameters['vertabeloXML'] = file
 
-        if propertyPrefix
-            parameters['propertyPrefix'] = propertyPrefix
-        end
+        if platform == "objectivec"
+            if propertyPrefix
+                parameters['propertyPrefix'] = propertyPrefix
+            end
 
-        if classPrefix
-            parameters['classPrefix'] = classPrefix
-        end
+            if classPrefix
+                parameters['classPrefix'] = classPrefix
+            end
+        elsif platform == "android"
+            if package
+                parameters['package'] = package
+            end
+        end        
 
-        RestClient.post(HTTP_SERVICE, parameters) { 
+        RestClient.post(HTTP_SERVICE + platform, parameters) { 
             |response, request, result, &block|
             case response.code
             when 200
@@ -58,8 +64,8 @@ class Mobiorm
         end
     end
 
-    def self.getOrm(file, path, classPrefix, propertyPrefix)
-        response = JSON.parse(generateOrm(file, classPrefix, propertyPrefix))
+    def self.getOrm(file, path, platform, classPrefix, propertyPrefix, package)
+        response = JSON.parse(generateOrm(file, platform, classPrefix, propertyPrefix, package))
         if response["status"] == "OK"
             response["result"]["errors"].each do |error|
                 puts "ERROR: " + error
@@ -78,20 +84,20 @@ class Mobiorm
         end
     end
 
-    def self.getOrmFromVertabelo(dest, token, id, tag, classPrefix, propertyPrefix)
+    def self.getOrmFromVertabelo(dest, platform, token, id, tag, classPrefix, propertyPrefix, package)
         path = "" + dest + "/"
         resource = self.downloadModel(token, id, tag)
         Tempfile.open("temp.xml") do |f|
             f.write(resource.get)
             f.rewind
-            self.getOrm(f, path, classPrefix, propertyPrefix)
+            self.getOrm(f, path, platform, classPrefix, propertyPrefix, package)
         end
     end
 
-    def self.getOrmFromFile(dest, xml, classPrefix, propertyPrefix)
+    def self.getOrmFromFile(dest, platform, xml, classPrefix, propertyPrefix, package)
         path = "" + dest + "/"
         File.open(xml) do |f|
-            self.getOrm(f, path, classPrefix, propertyPrefix)
+            self.getOrm(f, path, platform, classPrefix, propertyPrefix, package)
         end
     end
 end

metadata

@@ -1,41 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: mobiorm_client
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
+  prerelease: 
 platform: ruby
 authors:
 - Pawel Poskrobko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zipruby
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Generates ORM for Vertabelo XML
@@ -47,28 +52,29 @@ extra_rdoc_files: []
 files:
 - lib/mobiorm.rb
 - bin/mobiorm
-homepage: http://www.mobiorm.com
+homepage: http://mobile-orm.vertabelo.com
 licenses:
 - Apache License 2.0
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
-summary: Mobi ORM - OR Mapping for Objective-C
+specification_version: 3
+summary: Vertabelo Mobile ORM - OR mapping for mobile platforms
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: d6ebf5d367c104afa9dd726f627e7a3e2bd28d34
-  data.tar.gz: ddeec00a78c44373393376989f3069f5ae38f6ec
-SHA512:
-  metadata.gz: f0ebdca506bc75032cd1daa9f5ea90de88097853af5a90729ab77cded41aa8d5a771c6706e918924f410f38c9c393ffb3597cd2663df14d5a589ae3205f3db17
-  data.tar.gz: eeeec8d16711c5c18e1c53032c3d482a1af71f74d36ab64bf4b8b8c496d99cf0f454d9e534732f47d41e1109c8084d2cf10b06811f532ba869abc753b3c7b4cb