dm_live_resources 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5459e3cea0ed30d8ec2ce0cee7bcd909fcc4039d
-  data.tar.gz: 6856b05649f6a57500675a8e0636a7336e0168dc
+  metadata.gz: 53de0c8c7ac6abd93212dd45c314923b44e06a83
+  data.tar.gz: ebd24935a5b1d7cd113dc092f08637914eb89104
 SHA512:
-  metadata.gz: e82ad5138e5e410f08f0b3b64ef0a63d66fb4ab2d370b685546d6eaa6e7a534bf59c6626e36102b6bc83dd92d48c9fbd774db3bcfbb80517ef0a07805ae18b33
-  data.tar.gz: 49f89424749fb1455ffa3cef98835a26cb0a0eb23dc711301ff1a8766dee9101e92412d1ac0841c2bbee76f00c7f57fb3be06e14965afda2d6ce92d075ea6af7
+  metadata.gz: 46e37471783c233e7bdfaf5da6903ae33926751e66454ad1a9a171f577163289809b056433321a5490f7afc8ce55d860f9b75aa9a767f696f9ad266d6c7eab75
+  data.tar.gz: 441fd6ca459b6ff7dc306126fbc44bdd66f7487599cf8715b5a0d97e4baee586880099729ffe1f37283f27194a219e6eb9bad094b09031c6a9fb9caa6c3acb60

data/README.md

@@ -1,28 +1,16 @@
 # DmLiveResources
 
-Convert Google Sheets to be used as Resources in Device Magic.
+Add Google Sheets as live resources in Device Magic.
 
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'dm_live_resources'
-```
-
-And then execute:
+Device Magic users can upload .xlsx files to be referenced within their mobile forms.  This project is aimed at automating the same process for Google Sheets to increase the flexibility of resources.
 
-    $ bundle
-
-Or install it yourself as:
+## Installation
 
     $ gem install dm_live_resources
 
 ## Adding a Resource
 
-Trollop is used to pass arguments pertaining to the Google Sheet.  For more information on Trollop, see https://github.com/ManageIQ/trollop.
-
-To add a Google Sheet as a Resource, within your terminal execute:
+To add a Google Sheet as a Resource, in terminal execute:
 
     $ ruby add_resource --gs-api-key="Google Drive API Key" --gs-identifier="Google Sheet Identifier" --gs-sheets="Sheets in workbook to be tracked for changes" --dm-api-key="Device Magic API Key"
 
@@ -30,8 +18,6 @@ The first time this script is ran, a 'Resources.db' file will be created in the
 
 ## Updating a Resource
 
-In your terminal, execute:
-
     $ ruby update_db
 
 This will check to see if any changes have been made within the sheets you specified previously for your resources.  If there are changes, Device Magic will be updated with a new copy of the resource.

data/bin/add_resource

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require 'trollop'
-require 'dm_live_resources/resource_manager'
+require 'dm_live_resources'
 
 resource_data = Trollop::options do
   opt :gs_api_key, "Google Drive API Key", type: :string
@@ -9,17 +9,16 @@ resource_data = Trollop::options do
   opt :dm_api_key, "Device Magic API Key", type: :string
 end
 
-g_sheet = GSheet.new(resource_data)
-
+g_sheet = DmLiveResources::GSheet.new(resource_data)
 
 resource_data[:file] = g_sheet.exported_file
 resource_data[:description] = g_sheet.title
 
-dm_sheet = DMSheet.new(resource_data)
+dm_sheet = DmLiveResources::DMSheet.new(resource_data)
 dm_sheet.add_resource
 
 resource_data[:dm_id] = dm_sheet.id
 resource_data[:gs_content] = g_sheet.content
 resource_data[:gs_title] = g_sheet.title
 
-ResourceManager.new(resource_data).create_new_table
+DmLiveResources::ResourceManager.new(resource_data).create_new_table

data/bin/update_db

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-require 'dm_live_resources/resource_manager'
+require 'dm_live_resources'
 
-ResourceManager.update_db_tables
+DmLiveResources::ResourceManager.update_db_tables

data/dm_live_resources.gemspec

@@ -9,8 +9,10 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Anthony Seliga"]
   spec.email         = ["anthony.seliga@gmail.com"]
 
-  spec.summary       = %q{Convert Google Sheets to be used as Resources in Device Magic.}
-  spec.description   = %q{Convert Google Sheets to be used as Resources in Device Magic.}
+  spec.summary       = %q{Add Google Sheets as live resources in Device Magic.}
+  spec.description   = %q{Device Magic users can upload .xlsx files to be referenced within
+                          their mobile forms.  This project is aimed at automating the same process
+                          for Google Sheets to increase the flexibility of resources.  }
   spec.homepage      = "https://github.com/aseli1/dm_live_resources"
   spec.license       = "MIT"
 
@@ -30,10 +32,10 @@ Gem::Specification.new do |spec|
   spec.executables   = ['add_resource', 'update_db']
   spec.require_paths = ['lib', 'lib/dm_live_resources']
 
-  spec.add_runtime_dependency "httparty", "~> 0.15.5"
-  spec.add_runtime_dependency "trollop", "~> 2.1.2"
-  spec.add_runtime_dependency "sqlite3", "~> 1.3.13"
-  
+  spec.add_runtime_dependency "httparty", "~> 0.15"
+  spec.add_runtime_dependency "trollop", "~> 2.1"
+  spec.add_runtime_dependency "sqlite3", "~> 1.3"
+
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"

data/lib/dm_live_resources/dm_sheet.rb

@@ -1,67 +1,65 @@
-require 'base64'
 require 'httparty'
-require 'sqlite3'
 
-class DMSheet
-	attr_reader :api_key, :name, :file, :description, :id, :content_type, :auth,
-	:resource_hash
-	include HTTParty
+module DmLiveResources
+  class DMSheet
+    attr_reader :api_key, :name, :file, :description, :id, :content_type, :auth, :resource_hash
+    include HTTParty
 
-	def initialize(args = {})
-		@api_key = args[:dm_api_key]
-		@file = args[:file]
-		@description = args[:description]
-		@name = args[:name] ||= "#{description}.xlsx"
-		@id = args[:dm_id] ||= find_resource_id
-	end
+    def initialize(args = {})
+      @api_key = args[:dm_api_key]
+      @file = args[:file]
+      @description = args[:description]
+      @name = args[:name] ||= "#{description}.xlsx"
+      @id = args[:dm_id] ||= find_resource_id
+    end
 
-	def auth
-		@auth = { username: api_key, password: "p" }
-	end
+    def auth
+      @auth = { username: api_key, password: "p" }
+    end
 
-	def content_type
-		@content_type = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
-	end
+    def content_type
+      @content_type = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+    end
 
-	def resource_hash
-		@resource_hash = { "description" => description,"file" => { "file_name" => name,
-					"file_data" => file, "content_type" => content_type }}
-		@resource_hash
-	end
+    def resource_hash
+      @resource_hash = { "description" => description,"file" => { "file_name" => name,
+            "file_data" => file, "content_type" => content_type }}
+      @resource_hash
+    end
 
-	def request_options
-		@request_options = { basic_auth: auth, body: {"resource" => resource_hash }}
-		@request_options
-	end
+    def request_options
+      @request_options = { basic_auth: auth, body: {"resource" => resource_hash }}
+      @request_options
+    end
 
-	def id
-		@id = find_resource_id
-		@id
-	end
+    def id
+      @id = find_resource_id
+      @id
+    end
 
-	def list_resources
-		options = { basic_auth: auth }
-		response = self.class.get('https://www.devicemagic.com/api/resources.json', options)
-		resources = response['resources']
-		return resources
-	end
+    def list_resources
+      options = { basic_auth: auth }
+      response = self.class.get('https://www.devicemagic.com/api/resources.json', options)
+      resources = response['resources']
+      return resources
+    end
 
-	def find_resource_id
-		resources = list_resources
-		resources.each do |resource|
-			if resource['original_filename'] == name && resource['description'] == description
-				id = resource['id']
-				return id
-			end
-		end
-	end
+    def find_resource_id
+      resources = list_resources
+      resources.each do |resource|
+        if resource['original_filename'] == name && resource['description'] == description
+          id = resource['id']
+          return id
+        end
+      end
+    end
 
-	def add_resource
-		self.class.post('https://www.devicemagic.com/api/resources.json', request_options)
-	end
-
-	def update_resource
-		self.class.put("https://www.devicemagic.com/api/resources/#{id}.json", request_options)
-	end
+    def add_resource
+      self.class.post('https://www.devicemagic.com/api/resources.json', request_options)
+    end
 
+    def update_resource
+      self.class.put("https://www.devicemagic.com/api/resources/#{id}.json", request_options)
+    end
+  end
 end

data/lib/dm_live_resources/g_sheet.rb

@@ -1,45 +1,46 @@
 require 'base64'
 require 'httparty'
-require 'sqlite3'
 
-class GSheet
-	attr_reader :api_key, :identifier, :title, :sheets, :content_type, :exported_file, :content
-	include HTTParty
+module DmLiveResources
+	class GSheet
+		attr_reader :api_key, :identifier, :title, :sheets, :content_type, :exported_file, :content
+		include HTTParty
 
-	def initialize(args = {})
-		@api_key = args[:gs_api_key]
-		@identifier = args[:gs_identifier]
-		@title = args[:gs_title] ||= get_title
-		@sheets = args[:gs_sheets] ||= "Sheet1"
-  	end
+		def initialize(args = {})
+			@api_key = args[:gs_api_key]
+			@identifier = args[:gs_identifier]
+			@title = args[:gs_title] ||= get_title
+			@sheets = args[:gs_sheets] ||= "Sheet1"
+	  	end
 
-	def content_type
-		@content_type = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
-	end
+		def content_type
+			@content_type = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+		end
 
-	def content
-		options = { :query => {:key => api_key} }
-		request = self.class.get("https://sheets.googleapis.com/v4/spreadsheets/#{identifier}/values:batchGet?#{ranges}", options)
-		@content = request.to_s
-	end
+		def content
+			options = { :query => {:key => api_key} }
+			request = self.class.get("https://sheets.googleapis.com/v4/spreadsheets/#{identifier}/values:batchGet?#{ranges}", options)
+			@content = request.to_s
+		end
 
-	def get_title
-		params = { mimeType: content_type, key: api_key }
-		request = self.class.get("https://www.googleapis.com/drive/v3/files/#{identifier}", query: params)
-		@title = request["name"]
-	end
+		def get_title
+			params = { mimeType: content_type, key: api_key }
+			request = self.class.get("https://www.googleapis.com/drive/v3/files/#{identifier}", query: params)
+			@title = request["name"]
+		end
 
-	def ranges
-		split_sheets = sheets.split(", ")
-		range = split_sheets.map {|sheet| "ranges=#{sheet}"}
-		range = range.join("&")
-		return range
-	end
+		def ranges
+			split_sheets = sheets.split(", ")
+			range = split_sheets.map {|sheet| "ranges=#{sheet}"}
+			range = range.join("&")
+			return range
+		end
 
-	def exported_file
-		params = { mimeType: content_type, key: api_key }
-		request = self.class.get("https://www.googleapis.com/drive/v3/files/#{identifier}/export", query: params)
-		contents = request.body
-		@exported_file = Base64.encode64(contents)
+		def exported_file
+			params = { mimeType: content_type, key: api_key }
+			request = self.class.get("https://www.googleapis.com/drive/v3/files/#{identifier}/export", query: params)
+			contents = request.body
+			@exported_file = Base64.encode64(contents)
+		end
 	end
 end

data/lib/dm_live_resources/resource.rb

@@ -1,50 +1,52 @@
-require 'base64'
-require 'httparty'
 require 'sqlite3'
 
-class Resource
-	class << self
-		
-		def db
-			if File.exists? "Resources.db"
-				@db = SQLite3::Database.open "Resources.db"
-			else
-				@db = SQLite3::Database.new "Resources.db"
-			end
-		end
+module DmLiveResources
+  class Resource
+    class << self
+      def db
+        if File.exists? "Resources.db"
+          @db = SQLite3::Database.open "Resources.db"
+        else
+          @db = SQLite3::Database.new "Resources.db"
+        end
+      end
 
-		def remove_db
-			File.delete("Resources.db") if File.exists? "Resources.db"
-		end
+      def remove_db
+        File.delete("Resources.db") if File.exists? "Resources.db"
+      end
 
-		def update_required?(row, sheet)
-			return row['GSheetContent'] != sheet.content
-		end
+      def update_required?(row,
+      	                 sheet)
+        return row['GSheetContent'] != sheet.content
+      end
 
-		def return_tables
-			# List of all tables in db
-			tables = db.execute("SELECT name FROM sqlite_master WHERE type='table'").flatten
-			return tables
-		end
+      def return_tables
+        # List of all tables in db
+        tables = db.execute("SELECT name FROM sqlite_master WHERE type='table'").flatten
+        return tables
+      end
 
-		def data_as_hash(gs_api_key, gs_identifier, gs_sheets, gs_title, dm_api_key, dm_id)
-			data = {gs_api_key: gs_api_key,
-				gs_identifier: gs_identifier,
-				gs_sheets: gs_sheets,
-				gs_title: gs_title,
-				dm_api_key: dm_api_key,
-				dm_id: dm_id}
-			return data
-		end
+      def data_as_hash(gs_api_key, gs_identifier, gs_sheets, gs_title, dm_api_key, dm_id)
+        data = { gs_api_key: gs_api_key,
+                 gs_identifier: gs_identifier,
+                 gs_sheets: gs_sheets,
+                 gs_title: gs_title,
+                 dm_api_key: dm_api_key,
+                 dm_id: dm_id}
+        return data
+      end
 
-		def add_gsheet_data(data_hash, file, title)
-			data_hash[:file] = file
-			data_hash[:description] = title
-			return data_hash
-		end
+      def add_gsheet_data(data_hash,
+      	                file,
+      	                title)
+        data_hash[:file] = file
+        data_hash[:description] = title
+        return data_hash
+      end
 
-		def insert_query(table)
-			return %Q{INSERT INTO '#{table}' ( GSheetApiKey, GSheetIdentifier, GSheetTitle, GSheetContent, GSheetSheets, DMagicApiKey, DMagicId ) VALUES ( ?,?,?,?,?,?,? )}
-		end
-	end
+      def insert_query(table)
+        return %Q{INSERT INTO '#{table}' ( GSheetApiKey, GSheetIdentifier, GSheetTitle, GSheetContent, GSheetSheets, DMagicApiKey, DMagicId ) VALUES ( ?,?,?,?,?,?,? )}
+      end
+    end
+  end
 end

data/lib/dm_live_resources/resource_manager.rb

@@ -1,64 +1,62 @@
-require 'base64'
-require 'httparty'
-require 'sqlite3'
-
 require_relative 'g_sheet.rb'
 require_relative 'dm_sheet.rb'
 require_relative 'resource.rb'
 
-class ResourceManager
-  attr_reader :gsheet_api_key, :gsheet_identifier, :gsheet_title, :gsheet_content,
-  :gsheet_sheets, :dmagic_api_key, :dmagic_id, :table_name
-  @@db = Resource.db
+module DmLiveResources
+  class ResourceManager
+    attr_reader :gsheet_api_key, :gsheet_identifier, :gsheet_title, :gsheet_content,
+    :gsheet_sheets, :dmagic_api_key, :dmagic_id, :table_name
+    @@db = Resource.db
 
-  def initialize(args = {})
-    @gsheet_identifier = args[:gs_identifier]
-		@gsheet_title = args[:gs_title]
-		@gsheet_content = args[:gs_content]
-		@gsheet_sheets = args[:gs_sheets]
-		@gsheet_api_key = args[:gs_api_key]
-		@dmagic_api_key = args[:dm_api_key]
-		@dmagic_id = args[:dm_id]
-  end
+    def initialize(args = {})
+      @gsheet_identifier = args[:gs_identifier]
+      @gsheet_title = args[:gs_title]
+      @gsheet_content = args[:gs_content]
+      @gsheet_sheets = args[:gs_sheets]
+      @gsheet_api_key = args[:gs_api_key]
+      @dmagic_api_key = args[:dm_api_key]
+      @dmagic_id = args[:dm_id]
+    end
 
-  def table_name
-    gsheet_title
-  end
+    def table_name
+      gsheet_title
+    end
 
-  def create_new_table
-    @@db.execute %Q{
-     CREATE TABLE IF NOT EXISTS #{table_name} (
-     Id INTEGER PRIMARY KEY,
-     GSheetApiKey,
-     GSheetIdentifier,
-     GSheetTitle,
-     GSheetContent,
-     GSheetSheets,
-     DMagicApiKey,
-     DMagicId,
-     DateAdded datetime default current_timestamp)
-     }
-   @@db.execute(Resource.insert_query(table_name), gsheet_api_key, gsheet_identifier, gsheet_title, gsheet_content, gsheet_sheets, dmagic_api_key, dmagic_id)
-  end
+    def create_new_table
+      @@db.execute %Q{
+       CREATE TABLE IF NOT EXISTS #{table_name} (
+       Id INTEGER PRIMARY KEY,
+       GSheetApiKey,
+       GSheetIdentifier,
+       GSheetTitle,
+       GSheetContent,
+       GSheetSheets,
+       DMagicApiKey,
+       DMagicId,
+       DateAdded datetime default current_timestamp)
+       }
+     @@db.execute(Resource.insert_query(table_name), gsheet_api_key, gsheet_identifier, gsheet_title, gsheet_content, gsheet_sheets, dmagic_api_key, dmagic_id)
+    end
 
-  def self.check_tables(tables)
-    @@db.results_as_hash = true
-    tables.each do |table|
-      # Retrieve the last row added to the table
-      row = @@db.get_first_row("SELECT * FROM '#{table}' ORDER BY DateAdded DESC LIMIT 1")
-      resource_data = Resource.data_as_hash(row['GSheetApiKey'], row['GSheetIdentifier'], row['GSheetSheets'], row['GSheetTitle'], row['DMagicApiKey'], row['DMagicId'])
-      sheet = GSheet.new(resource_data)
-      if Resource.update_required?(row, sheet)
-        resource_data = Resource.add_gsheet_data(resource_data, sheet.exported_file, sheet.title)
-        dm = DMSheet.new(resource_data)
-        dm.update_resource
-        @@db.execute(Resource.insert_query(table), sheet.api_key, sheet.identifier, sheet.title, sheet.content, sheet.sheets, dm.api_key, dm.id)
+    def self.check_tables(tables)
+      @@db.results_as_hash = true
+      tables.each do |table|
+        # Retrieve the last row added to the table
+        row = @@db.get_first_row("SELECT * FROM '#{table}' ORDER BY DateAdded DESC LIMIT 1")
+        resource_data = Resource.data_as_hash(row['GSheetApiKey'], row['GSheetIdentifier'], row['GSheetSheets'], row['GSheetTitle'], row['DMagicApiKey'], row['DMagicId'])
+        sheet = GSheet.new(resource_data)
+        if Resource.update_required?(row, sheet)
+          resource_data = Resource.add_gsheet_data(resource_data, sheet.exported_file, sheet.title)
+          dm = DMSheet.new(resource_data)
+          dm.update_resource
+          @@db.execute(Resource.insert_query(table), sheet.api_key, sheet.identifier, sheet.title, sheet.content, sheet.sheets, dm.api_key, dm.id)
+        end
       end
     end
-  end
 
-  def self.update_db_tables
-    tables = Resource.return_tables
-    self.check_tables(tables)
+    def self.update_db_tables
+      tables = Resource.return_tables
+      self.check_tables(tables)
+    end
   end
 end

data/lib/dm_live_resources/version.rb

@@ -1,3 +1,3 @@
 module DmLiveResources
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/dm_live_resources.rb

@@ -1,4 +1,8 @@
 require "dm_live_resources/version"
+require "dm_live_resources/dm_sheet"
+require "dm_live_resources/g_sheet"
+require "dm_live_resources/resource_manager"
+
 
 module DmLiveResources
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dm_live_resources
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Anthony Seliga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-16 00:00:00.000000000 Z
+date: 2017-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.5
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.5
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +94,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-description: Convert Google Sheets to be used as Resources in Device Magic.
+description: "Device Magic users can upload .xlsx files to be referenced within\n
+  \                         their mobile forms.  This project is aimed at automating
+  the same process\n                          for Google Sheets to increase the flexibility
+  of resources.  "
 email:
 - anthony.seliga@gmail.com
 executables:
@@ -141,8 +144,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Convert Google Sheets to be used as Resources in Device Magic.
+summary: Add Google Sheets as live resources in Device Magic.
 test_files: []