ruby-wpdb 1.2 → 1.2.1

data/lib/ruby-wpdb/{comments.rb → comment.rb}

@@ -9,8 +9,8 @@ module WPDB
   class Comment < Sequel::Model(:"#{WPDB.prefix}comments")
     plugin :validation_helpers
 
-    many_to_one :post, :key => :comment_post_ID, :class => :'WPDB::Post'
-    one_to_many :commentmeta, :class => :'WPDB::CommentMeta'
+    many_to_one :post, key: :comment_post_ID, class: 'WPDB::Post'
+    one_to_many :commentmeta, class: 'WPDB::CommentMeta'
 
     def validate
       super
@@ -25,8 +25,4 @@ module WPDB
       super
     end
   end
-
-  class CommentMeta < Sequel::Model(:"#{WPDB.prefix}commentmeta")
-    many_to_one :comment, :class => :'WPDB::Comment'
-  end
 end

data/lib/ruby-wpdb/commentmeta.rb

@@ -0,0 +1,5 @@
+module WPDB
+  class CommentMeta < Sequel::Model(:"#{WPDB.prefix}commentmeta")
+    many_to_one :comment, class: :'WPDB::Comment'
+  end
+end

data/lib/ruby-wpdb/config.rb

@@ -1,6 +1,6 @@
 module WPDB
   module Config
-    class YAML
+    module ConfigFormat
       def initialize(file)
         if file.respond_to? :read
           @contents = file.read
@@ -11,10 +11,6 @@ module WPDB
         parse
       end
 
-      def parse
-        @config = ::YAML::load(@contents)
-      end
-
       def config
         uri  = 'mysql2://'
         uri += "#{@config['username']}:#{@config['password']}"
@@ -26,29 +22,64 @@ module WPDB
       end
     end
 
-    class WPConfig
-      def initialize(file)
-        if file.respond_to? :read
-          @contents = file.read
-        else
-          @contents = File.read(file)
-        end
+    class YAML
+      include ConfigFormat
 
-        parse
+      def parse
+        @config = ::YAML::load(ERB.new(@contents).result)
       end
+    end
+
+    class WPConfig
+      include ConfigFormat
 
       def parse
-        @config = Hash[@contents.scan(/define\((?:'|")(.+)(?:'|"), *(?:'|")(.+)(?:'|")\)/)]
-        @config['DB_PREFIX'] ||= 'wp_'
+        config = Hash[@contents.scan(/define\((?:'|")(.+)(?:'|"), *(?:'|")(.+)(?:'|")\)/)]
+        @config = {
+          "username" => config["DB_USER"],
+          "password" => config["DB_PASSWORD"],
+          "hostname" => config["DB_HOST"],
+          "database" => config["DB_NAME"],
+          "prefix"   => config["DB_PREFIX"] || "wp_"
+        }
       end
+    end
 
-      def config
-        uri  = 'mysql2://'
-        uri += "#{@config['DB_USER']}:#{@config['DB_PASSWORD']}"
-        uri += "@#{@config['DB_HOST']}"
-        uri += "/#{@config['DB_NAME']}"
+    class AutoDiscover
+      def initialize(directory = Dir.pwd)
+        @directory = Pathname(directory)
+      end
+
+      def file
+        @file ||= files.map { |file| @directory + file }.find { |file| File.exist?(file) }
+      end
+
+      private
+      def files
+        ["wp-config.php", "../wp-config.php", "wp/wp-config.php", "wordpress/wp-config.php", "config.yml"]
+      end
+    end
 
-        { uri: uri, prefix: @config['DB_PREFIX'] }
+    class AutoFormat
+      attr_reader :filename
+
+      def initialize(filename)
+        @filename = Pathname(filename)
+      end
+
+      def format
+        case filename.extname
+        when ".yml", ".yaml"
+          Config::YAML
+        when ".php"
+          Config::WPConfig
+        else
+          nil
+        end
+      end
+
+      def config
+        format.new(filename).config
       end
     end
   end

data/lib/ruby-wpdb/gravityforms.rb

@@ -1,4 +1,5 @@
 require 'php_serialize'
+require 'json'
 require 'csv'
 
 module WPDB
@@ -9,7 +10,11 @@ module WPDB
       one_to_one :meta, :class => :'WPDB::GravityForms::FormMeta'
 
       def fields
-        display_meta = PHP.unserialize(meta.display_meta)
+        begin
+          display_meta = PHP.unserialize(meta.display_meta)
+        rescue TypeError
+          display_meta = JSON.parse(meta.display_meta)
+        end
         display_meta['fields']
       end
 
@@ -117,8 +122,10 @@ module WPDB
       end
 
       def sanitise_label(original_label)
+        @labels ||= []
+
         original_label = original_label.to_s
-        return unless original_label.length > 0
+        return "" unless original_label.length > 0
 
         i = 1
 
@@ -159,7 +166,7 @@ module WPDB
 
           field_name = sanitise_label(field['label'])
 
-          next if field_name.blank?
+          next if field_name.empty?
 
           dataset = dataset.select_append(:"ld#{i}__value___#{field_name}")
         end
@@ -202,6 +209,7 @@ module WPDB
   # use in a Ruby variable name/symbol.
   def self.underscoreize(string)
     string.downcase
+      .gsub(/ +/, ' ')
       .gsub(' ', '_')
       .gsub(/[^a-z0-9_]/, '')
   end

data/lib/ruby-wpdb/link.rb

@@ -0,0 +1,16 @@
+module WPDB
+  class Link < Sequel::Model(:"#{WPDB.prefix}links")
+    include Termable
+
+    one_to_many :termrelationships,
+      key: :object_id,
+      key_method: :obj_id,
+      class: 'WPDB::TermRelationship'
+
+    many_to_many :termtaxonomy,
+      left_key: :object_id,
+      right_key: :term_taxonomy_id,
+      join_table: "#{WPDB.prefix}term_relationships",
+      class: 'WPDB::TermTaxonomy'
+  end
+end

data/lib/ruby-wpdb/{options.rb → option.rb}

@@ -18,7 +18,7 @@ module WPDB
     # @param [String] name The option_name to fetch
     # @return String
     def self.get_option(name)
-      Option.where(:option_name => name).get(:option_value)
+      Option.where(option_name: name).get(:option_value)
     end
   end
 end

data/lib/ruby-wpdb/post.rb

@@ -0,0 +1,66 @@
+Sequel.inflections do |inflect|
+  # Unless we tell Sequel otherwise, it will try to inflect the singular
+  # of "postmeta" using the "data" -> "datum" rule, leaving us with the
+  # bizarre "postmetum".
+  inflect.uncountable 'postmetas'
+end
+
+module WPDB
+  class Post < Sequel::Model(:"#{WPDB.prefix}posts")
+    include Termable
+
+    plugin :validation_helpers
+    plugin :sluggable, source: :post_title, target: :post_name
+
+    one_to_many :children,
+      key: :post_parent,
+      class: self do |ds|
+        ds.where(post_type: ['attachment', 'revision']).invert
+          .where(post_parent: self.ID)
+      end
+    one_to_many :revisions,
+      key: :post_parent,
+      class: self,
+      conditions: { post_type: 'revision' }
+
+    one_to_many :attachments,
+      key: :post_parent,
+      class: self,
+      conditions: { post_type: 'attachment' }
+
+    # In order to use Sequel add_postmeta function.
+    one_to_many :postmetas, class: 'WPDB::PostMeta'
+    one_to_many :comments, key: :comment_post_ID, class: 'WPDB::Comment'
+    one_to_many :termrelationships,
+      key: :object_id,
+      key_method: :obj_id,
+      class: 'WPDB::TermRelationship'
+
+    many_to_one :parent, class: self, key: :post_parent
+    many_to_one :author, key: :post_author, class: 'WPDB::User'
+
+    many_to_many :termtaxonomy,
+      left_key: :object_id,
+      right_key:  :term_taxonomy_id,
+      join_table: "#{WPDB.prefix}term_relationships",
+      class: 'WPDB::TermTaxonomy'
+
+    def validate
+      super
+      validates_presence [:post_title, :post_type, :post_status]
+      validates_unique :post_name
+    end
+
+    def before_validation
+      self.post_type      ||= "post"
+      self.post_status    ||= "draft"
+      self.post_parent    ||= 0
+      self.menu_order     ||= 0
+      self.comment_status ||= "open"
+      self.ping_status    ||= WPDB::Option.get_option("default_ping_status")
+      self.post_date      ||= Time.now
+      self.post_date_gmt  ||= Time.now.utc
+      super
+    end
+  end
+end

data/lib/ruby-wpdb/postmeta.rb

@@ -0,0 +1,5 @@
+module WPDB
+  class PostMeta < Sequel::Model(:"#{WPDB.prefix}postmeta")
+    many_to_one :post, class: 'WPDB::Post'
+  end
+end

data/lib/ruby-wpdb/term.rb

@@ -0,0 +1,41 @@
+module WPDB
+  class Term < Sequel::Model(:"#{WPDB.prefix}terms")
+    plugin :validation_helpers
+    plugin :sluggable, source: :name, target: :slug
+
+    one_to_many :termtaxonomies, class: 'WPDB::TermTaxonomy'
+
+    def validate
+      super
+      validates_presence :name
+    end
+  end
+
+  module Termable
+    # For objects that have a relationship with termtaxonomies, this
+    # module can be mixed in and gives the ability to add a term
+    # directly to the model, rather than creating the relationship
+    # yourself. Used by Post and Link.
+    def add_term(term, taxonomy, description, count)
+      if term.respond_to?(:term_id)
+        term_id = term.term_id
+      else
+        term_id = term.to_i
+      end
+
+      term_taxonomy = WPDB::TermTaxonomy.where(term_id: term_id, taxonomy: taxonomy).first
+      unless term_taxonomy
+        term_taxonomy = WPDB::TermTaxonomy.create(
+          term_id: term_id,
+          taxonomy: taxonomy,
+          description: description,
+          count: count
+        )
+      else
+        term_taxonomy.count += count
+      end
+
+      add_termtaxonomy(term_taxonomy)
+    end
+  end
+end

data/lib/ruby-wpdb/term_relationship.rb

@@ -0,0 +1,12 @@
+module WPDB
+  class TermRelationship < Sequel::Model(:"#{WPDB.prefix}term_relationships")
+    def_column_alias(:obj_id, :object_id)
+
+    many_to_one :post, class: 'WPDB::Post', key: :object_id
+    many_to_one :link, class: 'WPDB::Link', key: :object_id
+    
+    many_to_one :termtaxonomy,
+      class: 'WPDB::TermTaxonomy',
+      key: :term_taxonomy_id
+  end
+end

data/lib/ruby-wpdb/term_taxonomy.rb

@@ -0,0 +1,19 @@
+module WPDB
+  class TermTaxonomy < Sequel::Model(:"#{WPDB.prefix}term_taxonomy")
+    one_to_many :termrelationships, class: 'WPDB::TermRelationship'
+
+    many_to_one :term, class: 'WPDB::Term'
+
+    many_to_many :posts,
+      left_key: :term_taxonomy_id,
+      right_key: :object_id,
+      join_table: "#{WPDB.prefix}term_relationships",
+      class: 'WPDB::Post'
+
+    many_to_many :links,
+      left_key: :term_taxonomy_id,
+      right_key: :object_id,
+      join_table: "#{WPDB.prefix}term_relationships",
+      class: 'WPDB::Link'
+  end
+end

data/lib/ruby-wpdb/{users.rb → user.rb}

@@ -11,8 +11,8 @@ module WPDB
   class User < Sequel::Model(:"#{WPDB.user_prefix}users")
     plugin :validation_helpers
 
-    one_to_many :usermeta, :class => :'WPDB::UserMeta'
-    one_to_many :posts, :key => :post_author, :class => :'WPDB::Post'
+    one_to_many :usermeta, class: 'WPDB::UserMeta'
+    one_to_many :posts, key: :post_author, class: :'WPDB::Post'
 
     def validate
       super
@@ -33,7 +33,4 @@ module WPDB
       super
     end
   end
-
-  class UserMeta < Sequel::Model(:"#{WPDB.user_prefix}usermeta")
-  end
 end

data/lib/ruby-wpdb/usermeta.rb

@@ -0,0 +1,5 @@
+module WPDB
+  class UserMeta < Sequel::Model(:"#{WPDB.user_prefix}usermeta")
+    many_to_one :user, class: "WPDB::User"
+  end
+end

data/lib/ruby-wpdb/version.rb

@@ -1,3 +1,3 @@
 module WPDB
-  VERSION = "1.2"
+  VERSION = "1.2.1"
 end

data/lib/ruby-wpdb.rb

@@ -7,25 +7,29 @@ require 'pathname'
 require_relative 'ruby-wpdb/config'
 
 module WPDB
+  class ConfigFileError < StandardError; end
+
   class << self
     attr_accessor :db, :prefix, :user_prefix, :initialized
 
     # Given the path to a YAML file, will initialise WPDB using the
     # config files found in that file.
     def from_config(file = nil)
-      file ||= File.dirname(__FILE__) + '/../config.yml'
-      file = Pathname(file)
-
-      case file.extname
-      when ".yml"
-        config_file = Config::YAML.new(file)
-      when ".php"
-        config_file = Config::WPConfig.new(file)
-      end
+      config_file = config_file(file)
 
       init(config_file.config[:uri], config_file.config[:prefix])
     end
 
+    def config_file(file = nil)
+      file = Config::AutoDiscover.new.file unless file
+      raise ConfigFileError, "No config file specified, and none found" unless file
+
+      file = Config::AutoFormat.new(file)
+      raise ConfigFileError, "Unknown config file format for file #{file}" unless file.format
+
+      file
+    end
+
     # Initialises Sequel, sets up some necessary variables (like
     # WordPress's table prefix), and then includes our models.
     #
@@ -40,16 +44,20 @@ module WPDB
       WPDB.prefix      = prefix || 'wp_'
       WPDB.user_prefix = user_prefix || WPDB.prefix
 
-      require_relative 'ruby-wpdb/options'
-      require_relative 'ruby-wpdb/users'
-      require_relative 'ruby-wpdb/terms'
-      require_relative 'ruby-wpdb/posts'
-      require_relative 'ruby-wpdb/comments'
-      require_relative 'ruby-wpdb/links'
+      require_relative 'ruby-wpdb/option'
+      require_relative 'ruby-wpdb/user'
+      require_relative 'ruby-wpdb/usermeta'
+      require_relative 'ruby-wpdb/term'
+      require_relative 'ruby-wpdb/term_relationship'
+      require_relative 'ruby-wpdb/term_taxonomy'
+      require_relative 'ruby-wpdb/post'
+      require_relative 'ruby-wpdb/postmeta'
+      require_relative 'ruby-wpdb/comment'
+      require_relative 'ruby-wpdb/commentmeta'
+      require_relative 'ruby-wpdb/link'
       require_relative 'ruby-wpdb/gravityforms'
 
       WPDB.initialized = true
     end
   end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-wpdb
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: 1.2.1
 platform: ruby
 authors:
 - Rob Miller
@@ -109,33 +109,117 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
-  name: letters
+  name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: rubygems-tasks
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: guard-bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: mutant
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: mutant-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 description: ruby-wpdb gives you a painless way to access and interact with WordPress
   from Ruby, accessing posts, tags, and all other WordPress concepts as plain-old
   Ruby objects.
@@ -152,25 +236,20 @@ files:
 - data/query.log
 - data/wp-config-sample.php
 - lib/ruby-wpdb.rb
-- lib/ruby-wpdb/comments.rb
+- lib/ruby-wpdb/comment.rb
+- lib/ruby-wpdb/commentmeta.rb
 - lib/ruby-wpdb/config.rb
 - lib/ruby-wpdb/gravityforms.rb
-- lib/ruby-wpdb/links.rb
-- lib/ruby-wpdb/options.rb
-- lib/ruby-wpdb/posts.rb
-- lib/ruby-wpdb/terms.rb
-- lib/ruby-wpdb/users.rb
+- lib/ruby-wpdb/link.rb
+- lib/ruby-wpdb/option.rb
+- lib/ruby-wpdb/post.rb
+- lib/ruby-wpdb/postmeta.rb
+- lib/ruby-wpdb/term.rb
+- lib/ruby-wpdb/term_relationship.rb
+- lib/ruby-wpdb/term_taxonomy.rb
+- lib/ruby-wpdb/user.rb
+- lib/ruby-wpdb/usermeta.rb
 - lib/ruby-wpdb/version.rb
-- test/comments_test.rb
-- test/config_test.rb
-- test/gravityforms_test.rb
-- test/links_test.rb
-- test/options_test.rb
-- test/posts_test.rb
-- test/readme_test.rb
-- test/terms_test.rb
-- test/test_helper.rb
-- test/users_test.rb
 homepage: http://github.com/robmiller/ruby-wpdb
 licenses:
 - MIT
@@ -191,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A Ruby ORM wrapper for WordPress

data/lib/ruby-wpdb/links.rb

@@ -1,8 +0,0 @@
-module WPDB
-  class Link < Sequel::Model(:"#{WPDB.prefix}links")
-    include Termable
-
-    one_to_many :termrelationships, :key => :object_id, :key_method => :obj_id, :class => 'WPDB::TermRelationship'
-    many_to_many :termtaxonomy, :left_key => :object_id, :right_key => :term_taxonomy_id, :join_table => :"#{WPDB.prefix}term_relationships", :class => 'WPDB::TermTaxonomy'
-  end
-end