fmpvc 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6375927885c92d53b9e49ab8e2de3955e62b1994
-  data.tar.gz: a7af50f77aae4c3d9981b55385b7d088ade3b391
+  metadata.gz: a48828ff6c611455967a8a0c552d96b8154777d9
+  data.tar.gz: ab67f201c5175ef9de6ef3dbf00bef813eada7e3
 SHA512:
-  metadata.gz: 2f28fb3116aec19ad61c68833a966b9986fe604a03911ace19d30eaec817986bc04c58aa6398740094233489e67f095f1bff031857d89d58ad1ab2b86c102f49
-  data.tar.gz: 98ade21fcdf20bb15970a32895966741d27362d07d6090349ec74b79fb6f570d18b0ef0b67de1c03e5cedaa5bb6b3bb48b93916dcb7fc1f68ea280987af5e381
+  metadata.gz: a041a6056d1e2c9642f992c0c292bd398602cac14b434003bd1e4476addcce3eabfa5b6febc2f1a624d7c6001006dd73f60f796b961d4e9cc8d03cd0a9d3a2c2
+  data.tar.gz: d253b2ad1b7062c520f7e6e9cfdc9dd9afc046c84cf539ac0d909f48480ee41f12c3239abdad17f9684b1892c1ebb2068cdffc5240a58c56e90e1d19dc75ded1

data/.gitignore

@@ -16,6 +16,8 @@ spec/data/test_5/fmp_text/
 spec/data/test_6/fmp_text/
 spec/data/test_7/fmp_text/
 spec/data/test_8/fmp_text/
+spec/data/test_9/fmp_text/
+spec/data/test_10/fmp_text/
 
 .ruby-version
 .ruby-gemset

data/README.md

@@ -1,5 +1,7 @@
 # FMPVC
 
+#### **Warning:** with version changes in `FMPVC`, output format or content may change with no change to the underlying FileMaker files or their DDR.  Therefore, when using `FMPVC` with a version control system, it is prudent to only run a new version `fmpvc` on a clean repository and check for differences before proceeding.
+
 `FMPVC` is a tool to help FileMaker developers by creating a set of text files which represent design objects in their databases (e.g. scripts, custom functions, layouts, etc.).  `fmpvc` has no access to database content.  The command, `fmpvc`, parses a Database Design Report (DDR) produced by FileMaker Pro Advanced and creates text files for each of the primary FileMaker objects described in the DDR.  With those files the developer may:
 
 1. use a version control system to track changes to databases

data/RELEASE_NOTES.md

@@ -1,5 +1,12 @@
 # FMPVC Release Notes
 
+## v0.3.5 (2015-08-02)
+
+### Bugs Fixed
+
+- Fixed missing HTML entity characters from calculations (e.g. in Script Steps) by changing FMPReport content encoding (issue #6)
+- Fixed parsing problems with Table names containing single-quotes (issue #1)
+
 ## v0.3.4 (2015-07-02)
 
 ### New Features

data/lib/fmpvc/FMPReport.rb

@@ -11,13 +11,13 @@ module FMPVC
   
   class FMPReport
     
-    attr_reader :content, :type, :text_dir, :text_filename, :report_dirpath, :named_objects, :tables
+    attr_reader :content, :type, :text_dir, :text_filename, :report_dirpath, :named_objects, :tables, :scripts, :layouts, :value_lists, :custom_functions, :accounts, :privileges, :extended_privileges, :relationships, :file_access, :external_sources, :file_options, :themes
     
     def initialize(report_filename, ddr)
       report_dirpath    = "#{ddr.base_dir_ddr}/#{report_filename}"  # location of the fmpfilename.xml file
       raise(RuntimeError, "Error: can't find the report file, #{report_dirpath}") unless File.readable?(report_dirpath)
       
-      @content             = IO.read(report_dirpath, mode: 'rb:UTF-16:UTF-8') # transcode is specifically for a spec content match
+      @content             = IO.read(report_dirpath) 
       @text_dir            = "#{ddr.base_dir_ddr}/../#{FMPVC.configuration.text_dirname}"
       @text_filename       = fs_sanitize(report_filename)
       @report_dirpath      = "#{@text_dir}/#{@text_filename}"
@@ -245,7 +245,7 @@ module FMPVC
         table_header_format     = table_format.gsub(%r{d}, 's')
         content                 += format(table_header_format, "id", "Field Name", "Data Type", "Field Type", "Comment")
         content                 += format(table_header_format, "--", "----------", "---------", "----------", "-------")
-        a_table.xpath("//BaseTable[@name='#{a_table['name']}']/FieldCatalog/*[name()='Field']").each do |t| 
+        a_table.xpath(%{//BaseTable[@name=$table_name]/FieldCatalog/*[name()='Field']}, nil, :table_name => a_table['name']).each do |t| 
           t_comment             = t.xpath("./Comment").text
           content               += format(table_format, t['id'], t['name'], t['dataType'], t['fieldType'], t_comment)
         end

data/lib/fmpvc/version.rb

@@ -1,3 +1,3 @@
 module FMPVC
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fmpvc
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Martin S. Boswell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Create a text version of the design elements of a FileMaker database.